diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
index a5210a4ab8..ec9e45ebcf 100644
--- a/gst-libs/gst/gl/gstgldisplay.c
+++ b/gst-libs/gst/gl/gstgldisplay.c
@@ -911,9 +911,11 @@ gst_gl_display_remove_context (GstGLDisplay * display, GstGLContext * needle)
         GST_INFO_OBJECT (display, "removed context %" GST_PTR_FORMAT
             " from internal list", context);
         return;
-      } else
-        continue;
+      }
+      continue;
     }
+    prev = l;
+    l = l->next;
   }
 
   GST_WARNING_OBJECT (display, "%" GST_PTR_FORMAT " was not found in this "