diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp
index a014a917..5eb1078b 100644
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -707,7 +707,8 @@ void loop() {
 				updater.getUpgradeInformation(upinfo);
 				config.setUpgradeInformation(upinfo);
 				updater.ackUpgradeInformationChanged();
-				mqttHandler->publishFirmware();
+				if(mqttHandler != NULL)
+					mqttHandler->publishFirmware();
 				
 				if(upinfo.errorCode == AMS_UPDATE_ERR_SUCCESS_SIGNAL) {
 					debugW_P(PSTR("Rebooting to firmware version %s"), upinfo.toVersion);