diff --git a/src/aare/gui/threads/camera_thread.py b/src/aare/gui/threads/camera_thread.py
index d11744a9..7cc709cd 100644
--- a/src/aare/gui/threads/camera_thread.py
+++ b/src/aare/gui/threads/camera_thread.py
@@ -151,12 +151,14 @@ class SampleCameraThread(QThread):
                 continue  # Check self.running again
             except Exception as e:
                 self.__set_camera_available(False, f"Sample camera feed unavailable: {e}")
+                self.running = False
 
     def stop(self):
-        # Signal the thread to stop
         self.running = False
 
         if self.__socket:
             self.__socket.close()
-        self.quit()
-        self.wait()
+
+        if self.isRunning():
+            self.quit()
+            self.wait(2000)