diff --git a/menu/menu-dw b/menu/menu-dw
index 04ea471..efc2e3f 100644
--- a/menu/menu-dw
+++ b/menu/menu-dw
@@ -45,11 +45,6 @@ fi ;;
 7)
 sudo systemctl stop direwolf.service
 sudo systemctl stop http.server-dw.service
-sudo systemctl stop gpsd.service
-if systemctl status gpsd.service | grep enable >/dev/null 2>&1
-then 
-   sudo systemctl disable gpsd.service
-fi
 if systemctl status http.server-dw.service | grep enable >/dev/null 2>&1
 then 
    sudo systemctl disable http.server-dw.service
@@ -70,7 +65,15 @@ fi
 8)
 sudo systemctl stop direwolf.service
 sudo systemctl stop http.server-dw.service
-sudo systemctl stop gpsd.service
+if systemctl status gpsd.service | grep inactive >/dev/null 2>&1
+then 
+   sudo systemctl stop gpsd.service
+   sudo systemctl start gpsd.service
+fi
+if systemctl status gpsd.service | grep disable >/dev/null 2>&1
+then 
+   sudo systemctl enable gpsd.service
+fi
 if systemctl status http.server-dw.service | grep enable >/dev/null 2>&1
 then 
    sudo systemctl disable http.server-dw.service
@@ -85,18 +88,11 @@ else
 fi
    sudo sed -i "s/ExecStart=.*/ExecStart=\/usr\/local\/bin\/direwolf -c \/opt\/direwolf\/gpsd.conf/" /lib/systemd/system/direwolf.service
    sudo systemctl daemon-reload
-   sudo systemctl start gpsd.service
-   sudo systemctl enable gpsd.service
    sudo systemctl start direwolf.service
    sudo systemctl enable direwolf.service ;;
 9)
 sudo systemctl stop direwolf.service
 sudo systemctl stop http.server-dw.service
-sudo systemctl stop gpsd.service
-if systemctl status gpsd.service | grep enable >/dev/null 2>&1
-then 
-   sudo systemctl disable gpsd.service
-fi
 if systemctl status http.server-dw.service | grep enable >/dev/null 2>&1
 then 
    sudo systemctl disable http.server-dw.service
@@ -116,11 +112,6 @@ fi
 10)
 sudo systemctl stop direwolf.service
 sudo systemctl stop http.server-dw.service
-sudo systemctl stop gpsd.service
-if systemctl status gpsd.service | grep enable >/dev/null 2>&1
-then 
-   sudo systemctl disable gpsd.service
-fi 
 if [ "$(cat /proc/cpuinfo | grep 'Zero')" != "" ]; then
  
    sudo cp /opt/direwolf/direwolf1 /usr/local/bin/direwolf
@@ -138,11 +129,6 @@ fi
 11)
 sudo systemctl stop direwolf.service
 sudo systemctl stop http.server-dw.service
-sudo systemctl stop gpsd.service
-if systemctl status gpsd.service | grep enable >/dev/null 2>&1
-then 
-   sudo systemctl disable gpsd.service
-fi 
 if [ "$(cat /proc/cpuinfo | grep 'Zero')" != "" ]; then
  
    sudo cp /opt/direwolf/direwolf1 /usr/local/bin/direwolf
@@ -169,10 +155,6 @@ then
    sudo systemctl disable direwolf.service
 fi
    sudo systemctl stop direwolf.service
-if systemctl status gpsd.service | grep enable >/dev/null 2>&1
-then 
-   sudo systemctl disable gpsd.service
-fi
    sudo systemctl stop gpsd.service ;;
 13)
 break;