diff --git a/defaults/main.yml b/defaults/main.yml
index 40174da..e0b2e88 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -44,6 +44,19 @@ fusioninventory__agent_deploy_state: 'present'
 # The service name to manage.
 #
 fusioninventory__agent_service_name: 'fusioninventory-agent'
+                                                                   # ]]]
+# .. envvar:: fusioninventory__agent_service_status [[[
+#
+# The targeted service status.
+#
+fusioninventory__agent_service_status: 'started'
+                                                                   # ]]]
+
+# .. envvar:: fusioninventory__agent_service_enabled [[[
+#
+# The targeted service status.
+#
+fusioninventory__agent_service_enabled: true
 
                                                                    # ]]]
 # .. envvar:: fusioninventory__agent_service_manage [[[
diff --git a/tasks/main.yml b/tasks/main.yml
index 3ec261e..c4486f8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,3 +56,10 @@
     mode: '0644'
   when: fusioninventory__agent_deploy_state == "present"
   notify: ['restart fusioninventory-agent service']
+
+- name: Ensure the service is in the correct state
+  service:
+    name: "{{ fusioninventory__agent_service_name }}"
+    state: "{{ fusioninventory__agent_service_status }}"
+    enabled: "{{ fusioninventory__agent_service_enabled }}"
+  when: fusioninventory__agent_deploy_state == "present"