diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index f5de83948d..7367e71b1a 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -177,14 +177,12 @@ int32 RootLayer::WorkingThread(void *data)
 	for(;;)
 	{
 		err = messageQueue.GetNextReply(&code);
-
-		oneRootLayer->Lock();
-
-		if(err < B_OK)
-		{
+		if(err < B_OK) {
 			STRACE(("WorkingThread: messageQueue.GetNextReply failed\n"));
 			continue;
 		}
+
+		oneRootLayer->Lock();
 		
 		switch(code)
 		{