diff --git a/JoyKit/JOYController.m b/JoyKit/JOYController.m
index 92662adb..0d88f288 100644
--- a/JoyKit/JOYController.m
+++ b/JoyKit/JOYController.m
@@ -703,6 +703,7 @@ typedef struct __attribute__((packed)) {
         _forceStopPWMThread = true;
     }
     [_rumblePWMThreadLock unlock];
+    while (_rumblePWMThreadRunning);
 }
 
 + (void)controllerAdded:(IOHIDDeviceRef) device