diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index d7e8dbe..54af339 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -88,6 +88,12 @@ service:
     enabled: [% general.process_handler == 'none' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' ? 'true' : 'false' %]
 [% END -%]
+[% IF general.license_key != '' || general.anonymous_usage_statistics == 'yes' -%]
+
+  ngcp-license-client:
+    enabled: true
+    running: true
+[% END -%]
 [% IF mediator.enabled == 'yes' -%]
 
   mediator:
diff --git a/templates/511_init-daemons-ngcp-pro.yaml.tt2 b/templates/511_init-daemons-ngcp-pro.yaml.tt2
index d140634..3ad76ff 100644
--- a/templates/511_init-daemons-ngcp-pro.yaml.tt2
+++ b/templates/511_init-daemons-ngcp-pro.yaml.tt2
@@ -31,12 +31,6 @@ service:
   ngcp-snmp-agent:
     enabled: true
     running: true
-[% IF general.license_key != '' || general.anonymous_usage_statistics == 'yes' -%]
-
-  ngcp-license-client:
-    enabled: true
-    running: true
-[% END -%]
 [% IF faxserver.enable == "yes" -%]
 
   # XXX: This should be moved to the non-pro file, but the faxserver.enable