diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0015a35643..aaa2488bfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Checkout copy address data will sync on later change - @haukebri (#2661)
 - Fixed Safari style for sort-by select - @haukebri (#2642)
 - fixed My orders in My Profile not refreshed after putting an order - @filrak (#2559)
+- Fixed static file handler to immediately return 404 status for missing files - @grimason (#2685)
+- Fixed maxAge Response Header for static files and Content-Type for Service Worker - @grimason (#2686)
 
 ## [1.9.0-rc.1] - 2019.03.07
 
diff --git a/core/scripts/server.js b/core/scripts/server.js
index a2f3fc4160..dac9d2fb6a 100755
--- a/core/scripts/server.js
+++ b/core/scripts/server.js
@@ -103,15 +103,18 @@ function invalidateCache (req, res) {
 }
 
 const serve = (path, cache, options) => express.static(resolve(path), Object.assign({
-  maxAge: cache && isProd ? 60 * 60 * 24 * 30 : 0
+  maxAge: cache && isProd ? 2592000000 : 0, // 1 month in milliseconds = 1000 * 60 * 60 * 24 * 30 = 2592000000
+  fallthrough: false
 }, options))
 
 const themeRoot = require('../build/theme-path')
 
 app.use('/dist', serve('dist', true))
 app.use('/assets', serve(themeRoot + '/assets', true))
-app.use('/service-worker.js', serve('dist/service-worker.js', {
-  setHeaders: {'Content-Type': 'text/javascript; charset=UTF-8'}
+app.use('/service-worker.js', serve('dist/service-worker.js', false, {
+  setHeaders: function (res, path, stat) {
+    res.set('Content-Type', 'text/javascript; charset=UTF-8')
+  }
 }))
 
 const serverExtensions = require(resolve('src/server'))