diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
index 7278bc04..efab63a1 100644
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -329,7 +329,7 @@ void AmsWebServer::sysinfoJson() {
 		ea->getCostLastMonth(),
 		ea->getProducedLastMonth(),
 		ea->getIncomeLastMonth(),
-		(tz->toLocal(now)-now)/3600
+		tz == NULL ? 0 : (tz->toLocal(now)-now)/3600
 	);
 
 	stripNonAscii((uint8_t*) buf, size+1);
diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp
index 33186d8b..dc80b7b5 100644
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -414,6 +414,7 @@ void setup() {
 	ea.load();
 	ea.setEapi(eapi);
 	ws.setup(&config, &gpioConfig, &meterConfig, &meterState, &ds, &ea);
+	handleNtpChange();
 
 	#if defined(ESP32)
 		esp_task_wdt_init(WDT_TIMEOUT, true);