diff --git a/potato.py b/potato.py
index 8b16230..3cbdcb2 100644
--- a/potato.py
+++ b/potato.py
@@ -230,6 +230,10 @@ def spotclicked(self):
                     mode = "USB"
                 else:
                     mode = "LSB"
+            elif mode == "CW":
+                mode = "CW"
+            else:
+                mode = "USB" # default to USB for digital modes
 
             if self.check_port(SERVER_ADDRESS_FLRIG.split(":")[0], int(SERVER_ADDRESS_FLRIG.split(":")[1])) is True:
                 self.server_flrig.rig.set_mode(mode)