diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index 4552ae9..4a7dd6c 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -2587,8 +2587,12 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
 
         private async void WaitUDPPortChange()
         {
-            await TaskRunner.Run(() => Program.rootHub.UseUDPPort());
-            nUDUdpPortNum.Enabled = true;
+            await TaskRunner.Delay(100);
+            if (isUsingUDPServer())
+            {
+                await TaskRunner.Run(() => Program.rootHub.UseUDPPort());
+                nUDUdpPortNum.Enabled = true;
+            }
         }
 
         private void cBFlashWhenLate_CheckedChanged(object sender, EventArgs e)