diff --git a/src/service.py b/src/service.py
index 988c7eb13..f135a3a80 100644
--- a/src/service.py
+++ b/src/service.py
@@ -744,14 +744,14 @@ def _save_services(services):
     diff = {}
 
     for service_name, service_infos in services.items():
-        service_conf_base = conf_base.get(service_name, {})
+        service_conf_base = conf_base.get(service_name, {}) or {}
         diff[service_name] = {}
 
         for key, value in service_infos.items():
             if service_conf_base.get(key) != value:
                 diff[service_name][key] = value
 
-    diff = {name: infos for name, infos in diff.items() if infos}
+    diff = {name: infos for name, infos in diff.items() if infos or name not in conf_base}
 
     write_to_yaml(SERVICES_CONF, diff)