diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index c65c3f16d6d..68e9053101e 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1027,6 +1027,9 @@ int view3d_opengl_select(
 		        drw_select_loop_pass, &drw_select_loop_user_data,
 		        object_filter.fn, object_filter.user_data);
 		hits = drw_select_loop_user_data.hits;
+		/* FIX: This cleanup the state before doing another selection pass.
+		 * (see T56695) */
+		GPU_select_cache_end();
 	}
 
 	if (hits == 0) {