diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h
index aa2b68656..25ca7a6c8 100644
--- a/sonoff/sonoff_post.h
+++ b/sonoff/sonoff_post.h
@@ -435,8 +435,7 @@ void KNX_CB_Action(message_t const &msg, void *arg);
 #define MQTT_MAX_PACKET_SIZE   1000           // Bytes
 #endif
 #ifndef MQTT_KEEPALIVE
-//#define MQTT_KEEPALIVE         15             // Seconds
-#define MQTT_KEEPALIVE         30             // Changed to 30s which is min for AWS IoT, hoping it does not break anthing
+#define MQTT_KEEPALIVE         15             // Seconds
 #endif
 #ifndef MQTT_TIMEOUT
 #define MQTT_TIMEOUT           10000          // milli seconds
diff --git a/sonoff/xdrv_02_mqtt.ino b/sonoff/xdrv_02_mqtt.ino
index 10852cad8..34b17f281 100644
--- a/sonoff/xdrv_02_mqtt.ino
+++ b/sonoff/xdrv_02_mqtt.ino
@@ -237,7 +237,7 @@ void MqttPublish(const char* topic, bool retained)
 {
   char *me;
 #ifdef USE_MQTT_AWS_IOT
-  AddLog_P(LOG_LEVEL_INFO, S_LOG_MQTT, PSTR("Retained is not supported by AWS IoT, using retained = false."));
+  AddLog_P(LOG_LEVEL_DEBUG, S_LOG_MQTT, PSTR("Retained are not supported by AWS IoT, using retained = false."));
   retained = false;   // AWS IoT does not support retained, it will disconnect if received
 #endif