diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart
index 5743612..22e585e 100644
--- a/lib/popups/accept_jobs_popup.dart
+++ b/lib/popups/accept_jobs_popup.dart
@@ -60,7 +60,9 @@ Future<void> showAcceptJobsPopup(BuildContext context, List<Job> jobs, Function
 
                     jobsMap[jobdMessage.job.id] = jobdMessage.job;
 
-                    setState(() {});
+                    if (context.mounted) {
+                      setState(() {});
+                    }
                   });
 
                   return SizedBox(
diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart
index 05ba0b0..21c9475 100644
--- a/lib/tools/mqtt_core.dart
+++ b/lib/tools/mqtt_core.dart
@@ -5,6 +5,7 @@ import 'dart:typed_data';
 
 import 'package:archive/archive.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/foundation.dart';
 import 'package:isar/isar.dart';
 import 'package:mqtt_client/mqtt_client.dart';
 import 'package:mqtt_client/mqtt_server_client.dart';
@@ -102,7 +103,6 @@ class MqttCore {
       _mqttClient.keepAlivePeriod = 20;
       _mqttClient.autoReconnect = false;
       _mqttClient.onDisconnected = _clientDisconnected;
-
       _mqttClient.connectionMessage = MqttConnectMessage()
           .withClientIdentifier(await Util.getAppUuid())
           .withWillQos(MqttQos.atMostOnce)