diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml
index c83eaa0a0..877ab58e4 100644
--- a/roles/3-base-server/tasks/main.yml
+++ b/roles/3-base-server/tasks/main.yml
@@ -20,12 +20,6 @@
   # has no "when: XXXXX_install" flag
   tags: base, mysql
 
-- include_tasks: roles/network/tasks/wondershaper.yml
-  tags:
-    - wondershaper
-    - network
-  when: wondershaper_install
-
 - name: Make sure there is a content directory
   file: dest={{ doc_root }}/local_content
         state=directory
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 675dd805c..d52c088fc 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -19,6 +19,12 @@
 #  when: 'iiab_wan_iface != "none" and wan_ip != "dhcp"'
 ##### End static ip address info
 
+- include_tasks: roles/network/tasks/wondershaper.yml
+  tags:
+    - wondershaper
+    - network
+  when: wondershaper_install
+
 - include_tasks: hosts.yml
   tags:
     - network