diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
index b2738139063..7d8486d831c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc
@@ -504,7 +504,8 @@ static GPENCIL_tObject *grease_pencil_object_cache_populate(GPENCIL_PrivateData
                                   OB_MODE_PAINT_GREASE_PENCIL,
                                   OB_MODE_WEIGHT_GREASE_PENCIL,
                                   OB_MODE_VERTEX_GREASE_PENCIL) &&
-                            info.frame_number != pd->cfra && pd->use_multiedit_lines_only;
+                            info.frame_number != pd->cfra && pd->use_multiedit_lines_only &&
+                            do_multi_frame;
     const bool is_onion = info.onion_id != 0;
 
     visible_strokes.foreach_index([&](const int stroke_i, const int pos) {
@@ -523,7 +524,7 @@ static GPENCIL_tObject *grease_pencil_object_cache_populate(GPENCIL_PrivateData
       const bool hide_onion = is_onion && ((gp_style->flag & GP_MATERIAL_HIDE_ONIONSKIN) != 0 ||
                                            (!do_onion && !do_multi_frame));
       const bool skip_stroke = hide_material || (!show_stroke && !show_fill) ||
-                               (only_lines && !is_onion) || hide_onion;
+                               (only_lines && !do_onion && is_onion) || hide_onion;
 
       if (skip_stroke) {
         t_offset += num_triangles_per_stroke[pos];