diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 24a3e4f09..5fe64f8fc 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -11,22 +11,22 @@
 - name: Stop DansGuardian
   service: name=dansguardian
            state=stopped
-  when: not dansguardian_enabled and dansguardian_install
+  when: dansguardian_install
+
+- name: Stop Squid service
+  service: name={{ proxy }}
+           state=stopped
+  when: squid_install
 
 - name: Restart DansGuardian
   service: name=dansguardian
            state=restarted
   when: dansguardian_enabled and dansguardian_install
 
-- name: Stop Squid service
-  service: name={{ proxy }}
-           state=stopped
-  when: not squid_enabled and squid_install
-
 # Squid get re-loaded with dispatcher.d
 - name: Restart Squid service
   service: name={{ proxy }}
-           state=started
+           state=restarted
   when: squid_enabled and squid_install
 
 - name: Restart Wondershaper service