diff --git a/selfdrive/test/setup_device_ci.sh b/selfdrive/test/setup_device_ci.sh
index 13f25e0593..135d2ecc8d 100755
--- a/selfdrive/test/setup_device_ci.sh
+++ b/selfdrive/test/setup_device_ci.sh
@@ -15,6 +15,9 @@ if [ -z "$TEST_DIR" ]; then
   exit 1
 fi
 
+umount /data/safe_staging/merged/ || true
+sudo umount /data/safe_staging/merged/ || true
+
 if [ -f "/EON" ]; then
   rm -rf /data/core
   rm -rf /data/neoupdate