diff --git a/genie-app.service b/genie-app.service
index 28f22e9..daee846 100644
--- a/genie-app.service
+++ b/genie-app.service
@@ -5,6 +5,7 @@ Requires=network-online.target
 
 [Service]
 Type=simple
+Restart=on-failure
 User=genie
 Group=genie
 ExecStart=/opt/emacs-survey/bin/server
diff --git a/setup.org b/setup.org
index f61cd8c..e52b2cb 100644
--- a/setup.org
+++ b/setup.org
@@ -174,6 +174,7 @@ Requires=network-online.target
 
 [Service]
 Type=simple
+Restart=on-failure
 User=genie
 Group=genie
 ExecStart=/opt/emacs-survey/bin/server