diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 2c07d2f08..8a6c19710 100644
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -148,12 +148,18 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
-/etc/init.d/squid start
-/etc/init.d/openvpn start
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+	/etc/init.d/openvpn start
+fi
+
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec start
 fi
 
+if -f /var/ipfire/proxy/enable; then
+	/etc/init.d/squid start
+fi
+
 # This update needs a reboot...
 touch /var/run/need_reboot