diff --git a/src/servers/app/MultiLocker.h b/src/servers/app/MultiLocker.h
index 30446e57a2..318aea9012 100644
--- a/src/servers/app/MultiLocker.h
+++ b/src/servers/app/MultiLocker.h
@@ -25,13 +25,14 @@
 
 #define MULTI_LOCKER_TIMING	0
 #if DEBUG
+#	include <assert.h>
 #	define MULTI_LOCKER_DEBUG	DEBUG
 #endif
 
 #if MULTI_LOCKER_DEBUG
-#	define ASSERT_MULTI_LOCKED(x) ((x).IsWriteLocked() || (x).IsReadLocked())
-#	define ASSERT_MULTI_READ_LOCKED(x) ((x).IsReadLocked())
-#	define ASSERT_MULTI_WRITE_LOCKED(x) ((x).IsWriteLocked())
+#	define ASSERT_MULTI_LOCKED(x) assert((x).IsWriteLocked() || (x).IsReadLocked())
+#	define ASSERT_MULTI_READ_LOCKED(x) assert((x).IsReadLocked())
+#	define ASSERT_MULTI_WRITE_LOCKED(x) assert((x).IsWriteLocked())
 #else
 #	define MULTI_LOCKER_DEBUG	0
 #	define ASSERT_MULTI_LOCKED(x) ;
diff --git a/src/servers/app/Workspace.cpp b/src/servers/app/Workspace.cpp
index 617ecba1e1..887ee6cfb4 100644
--- a/src/servers/app/Workspace.cpp
+++ b/src/servers/app/Workspace.cpp
@@ -82,7 +82,6 @@ Workspace::Workspace(Desktop& desktop, int32 index)
 	fDesktop(desktop),
 	fCurrentWorkspace(index == desktop.CurrentWorkspace())
 {
-	ASSERT_MULTI_LOCKED(desktop.WindowLocker());
 	RewindWindows();
 }