diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c
index 5af373acb7..e00ea6e951 100644
--- a/sys/d3dvideosink/d3dvideosink.c
+++ b/sys/d3dvideosink/d3dvideosink.c
@@ -2243,13 +2243,6 @@ error:
 static gboolean
 gst_d3dvideosink_release_d3d_device (GstD3DVideoSink * sink)
 {
-  if (sink->d3ddev) {
-    int ref_count;
-    ref_count = IDirect3DDevice9_Release (sink->d3ddev);
-    sink->d3ddev = NULL;
-    GST_DEBUG_OBJECT (sink, "Direct3D device released. Reference count: %d",
-        ref_count);
-  }
   if (sink->d3d_offscreen_surface) {
     int ref_count;
     ref_count = IDirect3DSurface9_Release (sink->d3d_offscreen_surface);
@@ -2257,6 +2250,13 @@ gst_d3dvideosink_release_d3d_device (GstD3DVideoSink * sink)
     GST_DEBUG_OBJECT (sink,
         "Direct3D offscreen surface released. Reference count: %d", ref_count);
   }
+  if (sink->d3ddev) {
+    int ref_count;
+    ref_count = IDirect3DDevice9_Release (sink->d3ddev);
+    sink->d3ddev = NULL;
+    GST_DEBUG_OBJECT (sink, "Direct3D device released. Reference count: %d",
+        ref_count);
+  }
   return TRUE;
 }