diff --git a/roles/remoteit/tasks/enable-or-disable.yml b/roles/remoteit/tasks/enable-or-disable.yml
index 5f84dd426..6c7bb3180 100644
--- a/roles/remoteit/tasks/enable-or-disable.yml
+++ b/roles/remoteit/tasks/enable-or-disable.yml
@@ -6,6 +6,17 @@
     state: restarted    
   when: remoteit_enabled
 
+- name: Find the uuid for the connector
+  shell: ls /etc/systemd/system/multi-user.target.wants/ | grep remoteit
+  register: remoteit_service
+
+- name: Stop the uuid {{ remoteit_service.stdout }}
+  systemd:
+    name: "{{ remoteit_service.stdout }}"
+    enabled: no
+    state: stopped
+  when: not remoteit_enabled and not remoteit_service.stdout == ""
+
 - name: Disable & Stop remote.it's connectd daemon
   systemd:
     name: connectd