diff --git a/api/src/main/java/be/naaturel/boardmateapi/MqttStarter.java b/api/src/main/java/be/naaturel/boardmateapi/MqttStarter.java
index 82624bec..227a142e 100644
--- a/api/src/main/java/be/naaturel/boardmateapi/MqttStarter.java
+++ b/api/src/main/java/be/naaturel/boardmateapi/MqttStarter.java
@@ -1,5 +1,6 @@
 package be.naaturel.boardmateapi;
 
+import be.naaturel.boardmateapi.common.exceptions.ServiceException;
 import be.naaturel.boardmateapi.common.helpers.Logger;
 import be.naaturel.boardmateapi.services.MqttService;
 import jakarta.annotation.PostConstruct;
@@ -30,7 +31,11 @@ public class MqttStarter {
 
     @PreDestroy
     public void stop() {
-        service.disconnect();
+        try {
+            service.disconnect();
+        } catch (ServiceException se){
+            Logger.displayError("Failed to disconnect : " + se.getMessage());
+        }
     }
 
     private void setCallback(){