diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml
index b52d3b0cd..29c331ecc 100644
--- a/roles/network/tasks/netplan.yml
+++ b/roles/network/tasks/netplan.yml
@@ -63,7 +63,9 @@
   get_url:
     url: https://gitlab.com/craftyguy/networkd-dispatcher/-/raw/2.1/networkd-dispatcher
     dest: /usr/bin/networkd-dispatcher
-  when: fix_dispatcher and ansible_distribution_release == "groovy"
+  when: internet_available and fix_dispatcher and ansible_distribution_release == "groovy"
+  # 2021-08-29 context from @jvonau: Fix is 'Groovy' specific, 21.04 and later
+  # should have the fix baked into a newer apt package installed by default.
 
 #- name: Supply netplan template
 #  template:
diff --git a/roles/www_options/tasks/main.yml b/roles/www_options/tasks/main.yml
index 7d80e260e..b2c1afbc5 100644
--- a/roles/www_options/tasks/main.yml
+++ b/roles/www_options/tasks/main.yml
@@ -158,7 +158,7 @@
 
 - name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation.  (This script was installed in Stage 3 = roles/3-base-server/tasks/main.yml, which ran roles/www_base/tasks/main.yml)
   command: /usr/bin/iiab-refresh-wiki-docs
-  when: not nodocs
+  when: internet_available and not nodocs
 
 
 - name: (Re)Start '{{ apache_service }}' systemd service, if installed & enabled