diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 2528b619983..32d7a734bcb 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2673,7 +2673,8 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
 {
     HRESULT hr = S_OK;
     DWORD start_time = GetTickCount();
-    BOOL message_loop = TRUE;
+    APARTMENT *apt = COM_CurrentApt();
+    BOOL message_loop = apt && !apt->multi_threaded;
 
     TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles,
         pHandles, lpdwindex);