diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index 13eee39..ec66be2 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -583,6 +583,11 @@ namespace DS4Windows.Forms
                         Program.rootHub.suspending = true;
                         this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
                         wasrunning = true;
+
+                        while (this.changingService)
+                        {
+                            Thread.SpinWait(500);
+                        }
                     }
 
                     break;