diff --git a/contrib/systemd/offlineimap.service b/contrib/systemd/offlineimap.service
index 54d124b..9d419d8 100644
--- a/contrib/systemd/offlineimap.service
+++ b/contrib/systemd/offlineimap.service
@@ -2,12 +2,7 @@
 Description=Offlineimap Service
 
 [Service]
-Type=oneshot
-ExecStart=/usr/bin/offlineimap -o -u syslog
-# Give 12 seconds for offlineimap to gracefully stop before hard killing it.
-TimeoutStopSec=12
-#Restart=on-watchdog
-#WatchdogSec=300
+ExecStart=/usr/bin/offlineimap -u syslog
 
 [Install]
 WantedBy=mail.target
diff --git a/contrib/systemd/offlineimap@.service b/contrib/systemd/offlineimap@.service
index a2219b0..28ef332 100644
--- a/contrib/systemd/offlineimap@.service
+++ b/contrib/systemd/offlineimap@.service
@@ -2,10 +2,7 @@
 Description=Offlineimap Service for account %i
 
 [Service]
-Type=oneshot
-ExecStart=/usr/bin/offlineimap -o -a %i -u syslog
-#Restart=on-watchdog
-#WatchdogSec=300
+ExecStart=/usr/bin/offlineimap -a %i -u syslog
 
 [Install]
 WantedBy=mail.target