diff --git a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index d7d2ed578..d28a9ab21 100644
--- a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/proxy</mount>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <description>Squid web proxy settings</description>
     <items>
         <general>
@@ -362,7 +362,9 @@
                     </OptionValues>
                 </youtube>
                 <safePorts type="CSVListField">
-                    <Mask>/^([ \-0-9a-zA-Z:,])*/u</Mask>
+                    <default>80:http,21:ftp,443:https,70:gopher,210:wais,1025-65535:unregistered ports,280:http-mgmt,488:gss-http,591:filemaker,777:multiling http</default>
+                    <mask>/^([ \-0-9a-zA-Z:,])*/u</mask>
+                    <Required>Y</Required>
                 </safePorts>
                 <sslPorts type="CSVListField">
                     <Mask>/^([ \-0-9a-zA-Z:,])*/u</Mask>
diff --git a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
index 6c7369393..9574a9ae5 100644
--- a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
+++ b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
@@ -227,13 +227,10 @@ acl SSL_ports port {{element.split(":")[0]}} # {{element.split(":")[1]|default('
 {% endif %}
 
 # Default Safe ports are now defined in config.xml
-# Configured Safe ports (if defaults are not listed, then they have been removed from the configuration!):
-{% if helpers.exists('OPNsense.proxy.forward.acl.safePorts') %}
 # ACL - Safe_ports
-{%  for element in OPNsense.proxy.forward.acl.safePorts.split(",") %}
+{% for element in OPNsense.proxy.forward.acl.safePorts.split(",") %}
 acl Safe_ports port {{element.split(":")[0]}} # {{element.split(":")[1]|default('unknown')}}
-{%  endfor %}
-{% endif %}
+{% endfor %}
 acl CONNECT method CONNECT
 
 # ICAP SETTINGS