diff --git a/firmware/src/gps.c b/firmware/src/gps.c
index cb71e1a..56d628f 100644
--- a/firmware/src/gps.c
+++ b/firmware/src/gps.c
@@ -299,7 +299,7 @@ void gps_cfg_rst(void)
 		    (uint8_t*)&ubx_cfg_rst.payload,
 		    sizeof(ubx_cfg_rst.payload));
 
-  for (int i = 0; i < 1000*100*2; i++);
+  for (int i = 0; i < 1000*100; i++);
 }
 
 
@@ -511,6 +511,11 @@ void gps_init(void)
 
   kick_ext_watchdog();
 
+  /* Reset the GPS */
+  gps_cfg_rst();
+
+  kick_ext_watchdog();
+
   /* Incoming ubx messages are handled in an irq */
   usart_register_rx_callback(GPS_SERCOM, gps_rx_callback, GPS_SERCOM_INT_PRIO);