diff --git a/server/lib/systant/mqtt_client.ex b/server/lib/systant/mqtt_client.ex
index debd717..a2c5b60 100644
--- a/server/lib/systant/mqtt_client.ex
+++ b/server/lib/systant/mqtt_client.ex
@@ -36,22 +36,36 @@ defmodule Systant.MqttClient do
 
     case Tortoise.Connection.start_link(connection_opts) do
       {:ok, _pid} ->
-        Logger.info("MQTT client connected successfully")
+        Logger.info("MQTT client process started, verifying connection...")
         
-        # Send system metrics after a short delay to ensure dashboard is ready
-        startup_delay = Systant.Config.get(app_config, ["general", "startup_delay"]) || 5000
-        Process.send_after(self(), :publish_startup_stats, startup_delay)
-        Logger.info("Will publish initial stats in #{startup_delay}ms")
-        
-        # Publish Home Assistant discovery after MQTT connection
-        Process.send_after(self(), :publish_ha_discovery, 1000)
-        Logger.info("Will publish HA discovery in 1000ms")
-        
-        schedule_stats_publish(mqtt_config.publish_interval)
-        {:ok, state_config}
+        # Wait a bit to verify the connection actually works
+        case wait_for_connection(mqtt_config.client_id, 5000) do
+          :ok ->
+            Logger.info("MQTT connection verified successfully")
+            
+            # Send system metrics after a short delay to ensure dashboard is ready
+            startup_delay = Systant.Config.get(app_config, ["general", "startup_delay"]) || 5000
+            Process.send_after(self(), :publish_startup_stats, startup_delay)
+            Logger.info("Will publish initial stats in #{startup_delay}ms")
+            
+            # Publish Home Assistant discovery after MQTT connection
+            Process.send_after(self(), :publish_ha_discovery, 1000)
+            Logger.info("Will publish HA discovery in 1000ms")
+            
+            schedule_stats_publish(mqtt_config.publish_interval)
+            {:ok, state_config}
+            
+          :timeout ->
+            Logger.error("MQTT connection timeout - broker at #{mqtt_config.host}:#{mqtt_config.port} is not responding")
+            {:stop, :connection_timeout}
+            
+          {:error, reason} ->
+            Logger.error("MQTT connection verification failed: #{inspect(reason)}")
+            {:stop, reason}
+        end
         
       {:error, reason} ->
-        Logger.error("Failed to connect to MQTT broker: #{inspect(reason)}")
+        Logger.error("Failed to start MQTT client: #{inspect(reason)}")
         {:stop, reason}
     end
   end
@@ -131,4 +145,22 @@ defmodule Systant.MqttClient do
   defp schedule_stats_publish(interval) do
     Process.send_after(self(), :publish_stats, interval)
   end
+
+  defp wait_for_connection(client_id, timeout_ms) do
+    # Try to publish a test message to verify the connection
+    test_topic = "systant/connection_test"
+    test_payload = "test"
+    
+    case Tortoise.publish_sync(client_id, test_topic, test_payload, qos: 0, timeout: timeout_ms) do
+      :ok ->
+        Logger.debug("MQTT connection test successful")
+        :ok
+      {:error, :timeout} ->
+        Logger.error("MQTT connection test timed out")
+        :timeout
+      {:error, reason} ->
+        Logger.error("MQTT connection test failed: #{inspect(reason)}")
+        {:error, reason}
+    end
+  end
 end
\ No newline at end of file