diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index e9cd6c4f..c648a0e0 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -645,7 +645,7 @@ def _get_conf_hashes(service):
     if service not in services:
         logger.debug("Service %s is not in services.yml yet.", service)
         return {}
-    elif 'conffiles' not in services[service]:
+    elif services[service] is None or 'conffiles' not in services[service]:
         logger.debug("No configuration files for service %s.", service)
         return {}
     else:
@@ -658,6 +658,11 @@ def _update_conf_hashes(service, hashes):
                  service, hashes)
     services = _get_services()
     service_conf = services.get(service, {})
+
+    # Handle the case where services[service] is set to null in the yaml
+    if service_conf is None:
+        service_conf = {}
+
     service_conf['conffiles'] = hashes
     services[service] = service_conf
     _save_services(services)