diff --git a/subprojects/gst-plugins-base/ext/gl/gstglimagesink.c b/subprojects/gst-plugins-base/ext/gl/gstglimagesink.c
index 26b729e67f..3e621bea2d 100644
--- a/subprojects/gst-plugins-base/ext/gl/gstglimagesink.c
+++ b/subprojects/gst-plugins-base/ext/gl/gstglimagesink.c
@@ -1211,8 +1211,10 @@ gst_glimage_sink_set_context (GstElement * element, GstContext * context)
   GstGLDisplay *display = NULL;
 
   gst_gl_handle_set_context (element, context, &display, &other_context);
-  _set_other_context (gl_sink, other_context);
-  _set_display (gl_sink, display);
+  if (display)
+    _set_display (gl_sink, display);
+  if (other_context)
+    _set_other_context (gl_sink, other_context);
 
   if (gl_sink->display)
     gst_gl_display_filter_gl_api (gl_sink->display, SUPPORTED_GL_APIS);