diff --git a/package.json b/package.json
index 6820729..540ccdd 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "babel-preset-stage-0": "^6.5.0",
     "classnames": "^1.2.0",
     "express": "^4.12.0",
-    "express-force-ssl": "^0.3.0",
+    "express-force-ssl": "^0.3.1",
     "express-winston": "^0.3.1",
     "filepizza-socket": "^1.0.0",
     "newrelic": "^1.21.1",
diff --git a/src/server.js b/src/server.js
index 142b0a9..b8e87d1 100644
--- a/src/server.js
+++ b/src/server.js
@@ -71,7 +71,11 @@ app.use(expressWinston.logger({
   expressFormat: true
 }))
 
-if (process.env.NODE_ENV === 'production') {
+if (process.env.FORCE_SSL) {
+  app.set('forceSSLOptions', {
+    trustXFPHeader: true
+  })
+
   app.use(forceSSL)
 }