diff --git a/unit-files/static-discovery@.service b/unit-files/static-discovery@.service
index 83ddef70cfb12a7b4ca342f3f00290fa5c6d8dcf..74de2dd4e877780702fab11ff2549e6527ff0090 100644
--- a/unit-files/static-discovery@.service
+++ b/unit-files/static-discovery@.service
@@ -29,6 +29,6 @@ ExecStart=/bin/bash -c ' \
   done'
 
 # Stop
-ExecStop=/bin/bash -euxc ' \
+ExecStop=-/bin/bash -euxc ' \
   app=`echo %p | cut -d"-" -f1`; \
   /usr/bin/etcdctl rm /services/$app/%i
diff --git a/unit-files/static-git-discovery@.service b/unit-files/static-git-discovery@.service
index 2ff4c717a39b4a6fb0ce34a6f67c2eae4cf24764..9c67ab2ad1311b60cb6b3c8977087e121c4fe870 100644
--- a/unit-files/static-git-discovery@.service
+++ b/unit-files/static-git-discovery@.service
@@ -29,6 +29,6 @@ ExecStart=/bin/bash -c ' \
   done'
 
 # Stop
-ExecStop=/bin/bash -euxc ' \
+ExecStop=-/bin/bash -euxc ' \
   app=`echo %p | cut -d"-" -f1`; \
   /usr/bin/etcdctl rm /services/$app/%i
diff --git a/unit-files/wordpress-discovery@.service b/unit-files/wordpress-discovery@.service
index a5ef99d62c7f51de37c8f547005840e40dc93586..e1f146b405237ceda7c884a61c30f1aea9e4555e 100644
--- a/unit-files/wordpress-discovery@.service
+++ b/unit-files/wordpress-discovery@.service
@@ -29,6 +29,6 @@ ExecStart=/bin/bash -c ' \
   done'
 
 # Stop
-ExecStop=/bin/bash -euxc ' \
+ExecStop=-/bin/bash -euxc ' \
   app=`echo %p | cut -d"-" -f1`; \
   /usr/bin/etcdctl rm /services/$app/%i