diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py
index 9db81d27..2854e0a5 100644
--- a/daq/src/aaredaq/daq.py
+++ b/daq/src/aaredaq/daq.py
@@ -426,6 +426,8 @@ class AareDAQ:
                     logger.error(mount_error)
                     self.__aare.sample_failed(target, failed_comment = mount_error)
                     self.__mount_failure_handler(mount_error=mount_error)
+                    self.__cfg.current_sample = None
+                    logger.debug(f"setting current sample to None as previous unmount succeeded but mount failed")
                     raise MountingFailed(f"{mount_error}: drying gripper {target.sample_name} {target.location} {target.pin}")
                 elif value == "dry":
                     logger.info("Robot is drying")
@@ -437,8 +439,10 @@ class AareDAQ:
             if not mounted:
                 mount_error = "Failed to mount target"
                 logger.error(f"{mount_error}: {target.db_id} {target.location} {target.pin}")
-                self.__aare.sample_failed(target, failed_comment = "No sample was mounted")
-                self.__mount_failure_handler(mount_error=mount_error)
+                self.__aare.sample_failed(target, failed_comment = mount_error)
+                #self.__mount_failure_handler(mount_error=mount_error)
+                self.__cfg.current_sample = None
+                logger.debug(f"setting current sample to None but not sure if unmount succeeded")
                 raise MountingFailed(f"No Sample detected on smart magent: {target.sample_name} {target.location} {target.pin}")
 
             if target is not None: