diff --git a/CHANGELOG.md b/CHANGELOG.md
index a30ce498..f3218286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 
 ### Changed
 * elasticsearch: listen on local interface only by default
+* squid: Remove wait time when we turn off squid
 
 ### Fixed
 * lxc-php: Don't remove the default pool
diff --git a/squid/files/evolinux-defaults.conf b/squid/files/evolinux-defaults.conf
index ef11ea69..26bc7b27 100644
--- a/squid/files/evolinux-defaults.conf
+++ b/squid/files/evolinux-defaults.conf
@@ -2,6 +2,7 @@ http_port 127.0.0.1:3128
 coredump_dir /var/spool/squid
 max_filedescriptors 4096
 
+shutdown_lifetime 0 seconds
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp