diff --git a/main.go b/main.go
index e8c85ef..aae9e83 100644
--- a/main.go
+++ b/main.go
@@ -59,10 +59,7 @@ func main() {
 	}
 	l.Info("starting recognizer")
 
-	mqttClient, err := mqttclient.GetMqttClient(configuration)
-	if err != nil {
-		l.Errorf("Error getting mqttClient %v", err)
-	}
+	mqttClient := mqttclient.GetMqttClient(configuration)
 	doneChan := make(chan bool)
 	go func(doneChan chan bool) {
 		defer func() {
@@ -75,11 +72,15 @@ func main() {
 				continue
 			}
 
+			l.Info("Connecting to MQTT server")
 			err = mqttclient.ConnectToMqtt(mqttClient)
 			if err != nil {
 				l.Error("Failed to connect to MQTT", err)
 			}
-			defer mqttClient.Disconnect(250)
+			defer func() {
+				l.Info("Disconnecting from MQTT server")
+				mqttClient.Disconnect(250)
+			}()
 
 			sourceBytes, err := os.ReadFile(configuration.TargetImagePath)
 			if err != nil {
diff --git a/pkg/mqttclient/mqttclient.go b/pkg/mqttclient/mqttclient.go
index 7eb779b..ee32e16 100644
--- a/pkg/mqttclient/mqttclient.go
+++ b/pkg/mqttclient/mqttclient.go
@@ -19,7 +19,7 @@ var connectLostHandler mqtt.ConnectionLostHandler = func(client mqtt.Client, err
 	fmt.Printf("Connect lost: %v", err)
 }
 
-func GetMqttClient(configuration *config.Config) (mqtt.Client, error) {
+func GetMqttClient(configuration *config.Config) mqtt.Client {
 	broker := configuration.MqttBroker
 	port := configuration.MqttPort
 	opts := mqtt.NewClientOptions()
@@ -32,10 +32,7 @@ func GetMqttClient(configuration *config.Config) (mqtt.Client, error) {
 	opts.OnConnect = connectHandler
 	opts.OnConnectionLost = connectLostHandler
 	client := mqtt.NewClient(opts)
-	if token := client.Connect(); token.Wait() && token.Error() != nil {
-		return client, token.Error()
-	}
-	return client, nil
+	return client
 }
 
 func ConnectToMqtt(client mqtt.Client) error {