diff --git a/firmware/esp32/main/mqtt.cpp b/firmware/esp32/main/mqtt.cpp
index b7d04de..f88ace2 100644
--- a/firmware/esp32/main/mqtt.cpp
+++ b/firmware/esp32/main/mqtt.cpp
@@ -85,16 +85,16 @@ void mqtt_publish(void) {}
 void mqttTask(void *pvParameters) {
     ESP_LOGV(TAG, "Task started");
 
-    //i2c_task_handle = xTaskGetCurrentTaskHandle();
+    ESP_LOGV(TAG, "Waiting for Wi-Fi before initializing server");
+    xEventGroupWaitBits(connectivity_event_group, WIFI_CONNECTED_BIT, pdFALSE, pdTRUE, portMAX_DELAY);
+    ESP_LOGV(TAG, "Server initialized");
 
     mqtt_init();
-
     ESP_ERROR_CHECK(esp_task_wdt_add(NULL));
 
     for(;;) {
         ESP_LOGV(TAG, "Checking connection...");
         xEventGroupWaitBits(connectivity_event_group, WIFI_CONNECTED_BIT | MQTT_CONNECTED_BIT, pdFALSE, pdTRUE, portMAX_DELAY);
-
         ESP_LOGV(TAG, "Connection present");
 
         uint32_t task_notification = ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(MQTT_TASK_TIMEOUT_MS));