diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml
index 4090d8757..111da6df4 100644
--- a/roles/pbx/tasks/enable-or-disable.yml
+++ b/roles/pbx/tasks/enable-or-disable.yml
@@ -25,10 +25,19 @@
     command: a2dissite freepbx.conf
     when: not pbx_enabled
 
-  - name: Restart Apache service ({{ apache_service }})
+  - name: Restart and Enable Apache service ({{ apache_service }}) if pbx_enabled
     systemd:
       name: "{{ apache_service }}"    # apache2
       state: restarted
+      enabled: yes
+    when: pbx_enabled
+
+  - name: Stop and Disable Apache service ({{ apache_service }}) if not pbx_enabled
+    systemd:
+      name: "{{ apache_service }}"    # apache2
+      state: stopped
+      enabled: no
+    when: not pbx_enabled
 
   when: not pbx_try_nginx