diff --git a/roles/nginx/tasks/enable-or-disable.yml b/roles/nginx/tasks/enable-or-disable.yml
index beebc2da5..8294903ca 100644
--- a/roles/nginx/tasks/enable-or-disable.yml
+++ b/roles/nginx/tasks/enable-or-disable.yml
@@ -1,7 +1,8 @@
-- name: Ensure that Apache (({{ apache_service }})) is not running -- we may need port swap
+- name: Ensure that Apache ({{ apache_service }}) is not running -- we may need port swap
   systemd:
     name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
     state: stopped
+  when: apache_installed is defined
 
 - name: Install /etc/{{ apache_service }}/ports.conf from template 1 of 2 (ports.conf.j2) if nginx_enabled, to enable Apache port {{ apache_port }} localhost only
   template:
@@ -21,7 +22,7 @@
     daemon_reload: yes
     state: restarted
     enabled: true
-  when: apache_enabled or not nginx_enabled
+  when: apache_installed is defined and apache_enabled    # or not nginx_enabled
 
 
 - name: Enable & (Re)Start 'nginx' systemd service, if nginx_enabled