diff --git a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
index d20abcd2e1..2fe593d60b 100644
--- a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11videosink.cpp
@@ -760,7 +760,7 @@ gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self)
     GST_INFO_OBJECT (self,
         "Create dummy window for rendering on shared texture");
     self->window = gst_d3d11_window_dummy_new (self->device);
-    return TRUE;
+    goto done;
   }
 
   if (!self->window_id)
@@ -809,6 +809,7 @@ gst_d3d11_video_sink_prepare_window (GstD3D11VideoSink * self)
       break;
   }
 
+done:
   if (!self->window) {
     GST_ERROR_OBJECT (self, "Cannot create d3d11window");
     return FALSE;