diff --git a/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp b/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
index 9bdc08af30..0fff2fec54 100644
--- a/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
+++ b/src/add-ons/media/media-add-ons/videowindow/VideoNode.cpp
@@ -64,7 +64,7 @@ VideoNode::~VideoNode()
 	Quit();
 	DeleteBuffers();
 	delete fBitmapLocker;
-	if (fWindow)
+	if (fWindow /*&& fWindow->Lock()*/)
 		fWindow->Quit();
 }