diff --git a/Scripts/tmpwatch b/Scripts/tmpwatch
index 5aa1eb521..b834a417d 100644
--- a/Scripts/tmpwatch
+++ b/Scripts/tmpwatch
@@ -4,4 +4,4 @@
 SOGOSPOOL=/var/spool/sogo
 
 /usr/sbin/tmpwatch 24 "$SOGOSPOOL"
-find "$SOGOSPOOL" -depth -mindepth 1 -type d -empty -exec /bin/rmdir {} \; 2> /dev/null
+find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null
diff --git a/packaging/debian-multiarch/sogo.cron.daily b/packaging/debian-multiarch/sogo.cron.daily
index 623388ff4..d28a8faa8 100644
--- a/packaging/debian-multiarch/sogo.cron.daily
+++ b/packaging/debian-multiarch/sogo.cron.daily
@@ -3,4 +3,4 @@
 SOGOSPOOL=/var/spool/sogo
 
 /usr/sbin/tmpreaper 24 "$SOGOSPOOL"
-find "$SOGOSPOOL" -mindepth 1 -type d -empty -exec /bin/rmdir {} \; 2> /dev/null
+find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null
diff --git a/packaging/debian/sogo.cron.daily b/packaging/debian/sogo.cron.daily
index 623388ff4..d28a8faa8 100644
--- a/packaging/debian/sogo.cron.daily
+++ b/packaging/debian/sogo.cron.daily
@@ -3,4 +3,4 @@
 SOGOSPOOL=/var/spool/sogo
 
 /usr/sbin/tmpreaper 24 "$SOGOSPOOL"
-find "$SOGOSPOOL" -mindepth 1 -type d -empty -exec /bin/rmdir {} \; 2> /dev/null
+find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null