diff --git a/helper/tmpdir-setup b/helper/tmpdir-setup
index 088acdf3..fe47dc79 100755
--- a/helper/tmpdir-setup
+++ b/helper/tmpdir-setup
@@ -52,10 +52,12 @@ cmd_cleanup() {
     (( $# == 1 )) || usage
     MXQ_JOBID=$1
 
-    mountpoint=$mntdir/$MXQ_JOBID
-
-    umount $mountpoint
-    rmdir $mountpoint
+    (
+        shopt -s dotglob;
+        rm -rf /dev/shm/mxqd/mnt/job/$MXQ_JOBID/*
+        umount /dev/shm/mxqd/mnt/job/$MXQ_JOBID
+        rmdir /dev/shm/mxqd/mnt/job/$MXQ_JOBID
+    ) &
 }
 
 (( $# > 0 )) || usage