diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in
index d753e6d05f7..7fbfd97aedc 100644
--- a/etc/guix-daemon.service.in
+++ b/etc/guix-daemon.service.in
@@ -17,6 +17,9 @@ StandardError=syslog
 # (including the daemon!) if any child, such as cc1plus, runs out of memory.
 OOMPolicy=continue
 
+# Despite the name, this is rate-limited: a broken daemon will eventually fail.
+Restart=always
+
 # See <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00608.html>.
 # Some package builds (for example, go@1.8.1) may require even more than
 # 1024 tasks.
diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in
index 78f04714eb3..104a726865f 100644
--- a/etc/guix-publish.service.in
+++ b/etc/guix-publish.service.in
@@ -15,6 +15,9 @@ RemainAfterExit=yes
 StandardOutput=syslog
 StandardError=syslog
 
+# Despite the name, this is rate-limited: a broken daemon will eventually fail.
+Restart=always
+
 # See <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00608.html>.
 TasksMax=1024