diff --git a/roles/nodered/tasks/main.yml b/roles/nodered/tasks/main.yml
index 34a800685..d60e7316d 100644
--- a/roles/nodered/tasks/main.yml
+++ b/roles/nodered/tasks/main.yml
@@ -46,14 +46,6 @@
     mode: 0666
   when: nodered_install
 
-- name: Enable & Start node-red service
-  systemd:
-    daemon_reload: yes
-    name: node-red
-    enabled: yes
-    state: started
-  when: nodered_enabled
-
 - name: Copy nodered.conf to apache sites-available
   template:
     backup: yes
@@ -91,6 +83,22 @@
     state: restarted
   when: nodered_enabled
 
+- name: Enable & Start node-red service
+  systemd:
+    daemon_reload: yes
+    name: node-red
+    enabled: yes
+    state: started
+  when: nodered_enabled
+
+- name: Disable & Stop node-red service
+  systemd:
+    daemon_reload: yes
+    name: node-red
+    enabled: no
+    state: stopped
+  when: (not nodered_enabled)
+
 - name: Add 'nodered' variable values to {{ iiab_ini_file }}
   ini_file:
     path: "{{ iiab_ini_file }}"