diff --git a/src/gpsread.cpp b/src/gpsread.cpp
index 45f1b65d..78683b7a 100644
--- a/src/gpsread.cpp
+++ b/src/gpsread.cpp
@@ -159,6 +159,13 @@ void gps_loop(void *pvParameters) {
         delay(2); // 2ms delay according L76 datasheet
       }
 #endif
+
+      // if time hasn't been synchronised yet, and we have a valid GPS time,
+      // update time from GPS.
+      if (timeSource == _unsynced && gpstime.isUpdated() && gpstime.isValid()) {
+        calibrateTime();
+      }
+
     } // if
 
     // show NMEA data in verbose mode, useful for debugging GPS, bu tvery noisy
diff --git a/src/main.cpp b/src/main.cpp
index e7b497c7..175e78f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -488,11 +488,6 @@ void setup() {
 #warning you did not specify a time source, time will not be synched
 #endif
 
-// initialize gps time
-#if (HAS_GPS)
-  get_gpstime();
-#endif
-
 #if (defined HAS_IF482 || defined HAS_DCF77)
   ESP_LOGI(TAG, "Starting Clock Controller...");
   clock_init();
diff --git a/src/timekeeper.cpp b/src/timekeeper.cpp
index bc9e52b5..0dba7caa 100644
--- a/src/timekeeper.cpp
+++ b/src/timekeeper.cpp
@@ -26,12 +26,13 @@ Ticker timesyncer;
 void timeSync() { xTaskNotify(irqHandlerTask, TIMESYNC_IRQ, eSetBits); }
 
 void calibrateTime(void) {
-
+  ESP_LOGD(TAG, "[%0.3f] calibrateTime, timeSource == %d", millis() / 1000.0,
+           timeSource);
   time_t t = 0;
   uint16_t t_msec = 0;
 
   // kick off asychronous lora timesync if we have
-#if (HAS_LORA) && (TIME_SYNC_LORASERVER) || (TIME_SYNC_LORAWAN)
+#if (HAS_LORA) && ((TIME_SYNC_LORASERVER) || (TIME_SYNC_LORAWAN))
   timesync_request();
 #endif
 
@@ -43,17 +44,17 @@ void calibrateTime(void) {
 // has RTC -> fallback to RTC time
 #ifdef HAS_RTC
     t = get_rtctime();
-    timeSource = _rtc;
+    // set time from RTC
+    setMyTime((uint32_t)t, t_msec, _rtc);
 #endif
 
 // no RTC -> fallback to GPS time
 #if (HAS_GPS)
     t = get_gpstime(&t_msec);
-    timeSource = _gps;
+    // set time from GPS - method will check if time is valid
+    setMyTime((uint32_t)t, t_msec, _gps);
 #endif
 
-    setMyTime((uint32_t)t, t_msec, timeSource); // set time
-
   } // fallback
 
   else