diff --git a/share/pkgs/services/systemd/opennebula-ssh-socks-cleaner.timer b/share/pkgs/services/systemd/opennebula-ssh-socks-cleaner.timer
index 5b9662761c..0cb52fa2f8 100644
--- a/share/pkgs/services/systemd/opennebula-ssh-socks-cleaner.timer
+++ b/share/pkgs/services/systemd/opennebula-ssh-socks-cleaner.timer
@@ -3,8 +3,11 @@ Description=OpenNebula SSH persistent connection cleaner
 After=remote-fs.target
 
 [Timer]
-OnActiveSec=0s
-OnUnitActiveSec=30s
+## Replaced by OnCalendar due to issue #4939
+#OnActiveSec=0s
+#OnUnitActiveSec=30s
+OnCalendar=*-*-* *:*:10
+OnCalendar=*-*-* *:*:40
 AccuracySec=1s
 
 [Install]