diff --git a/src/aare/gui/panels/sample_queue_panel.py b/src/aare/gui/panels/sample_queue_panel.py
index affa50f8..da7ef53d 100644
--- a/src/aare/gui/panels/sample_queue_panel.py
+++ b/src/aare/gui/panels/sample_queue_panel.py
@@ -53,7 +53,6 @@ class SampleQueuePanel(QFrame):
         self._experiment_shutter_state = None
         self._door_prohibited = None
         self._tell_connected = True
-        self.loop_restart_requested = None
 
         self._recovery_timer = QTimer(self)
         self._recovery_timer.setSingleShot(True)
@@ -284,20 +283,12 @@ class SampleQueuePanel(QFrame):
     def _finish_empty_queue(self):
         self.pause_automation()
 
-        if hasattr(self, "loop_restart_requested"):
-            logger.info("Loop restart requested")
-            try:
-                if self.loop_restart_requested():
-                    return
-            except Exception:
-                logger.exception("Loop restart request failed")
+        logger.info("Automation queue empty; unmounting current sample.")
+        self.unmount.emit()
 
         if self.park_and_dry_when_cleared.isChecked():
             logger.info("Automation queue empty; parking and drying TELL.")
             self.park_and_dry.emit()
-        else:
-            logger.info("Automation queue empty; unmounting current sample.")
-            self.unmount.emit()
 
     def run(self):
         self._recovery_timer.stop()