diff --git a/Firmware/RTK_Everywhere/States.ino b/Firmware/RTK_Everywhere/States.ino
index 548b699e..6469f03d 100644
--- a/Firmware/RTK_Everywhere/States.ino
+++ b/Firmware/RTK_Everywhere/States.ino
@@ -100,6 +100,9 @@ void stateUpdate()
             displayRoverStart(0);
             if (gnss->configureRover() == false)
             {
+                settings.updateGNSSSettings = true; // On the next boot, update the GNSS receiver
+                recordSystemSettings(); // Record this state for next POR
+
                 systemPrintln("Rover config failed");
                 displayRoverFail(1000);
                 return;
@@ -115,7 +118,7 @@ void stateUpdate()
                 displayRoverFail(1000);
             else
             {
-                settings.updateGNSSSettings = false; // On the next boot, no need to update the ZED on this profile
+                settings.updateGNSSSettings = false; // On the next boot, no need to update the GNSS receiver
                 settings.lastState = STATE_ROVER_NOT_STARTED;
                 recordSystemSettings(); // Record this state for next POR
 
@@ -230,6 +233,9 @@ void stateUpdate()
             }
             else
             {
+                settings.updateGNSSSettings = true; // On the next boot, update the GNSS receiver
+                recordSystemSettings(); // Record this state for next POR
+
                 displayBaseFail(1000);
             }
         }
@@ -567,7 +573,7 @@ void stateUpdate()
             else
             {
                 if (settings.debugNtp)
-                    systemPrintln("NTP Server ZED configuration failed");
+                    systemPrintln("NTP Server configuration failed");
                 displayNTPFail(1000); // Show 'NTP Failed'
                 // Do we stay in STATE_NTPSERVER_NOT_STARTED? Or should we reset?
             }