diff --git a/src/smeagol/handler.clj b/src/smeagol/handler.clj
index d25e415..9cbaca5 100644
--- a/src/smeagol/handler.clj
+++ b/src/smeagol/handler.clj
@@ -97,6 +97,7 @@
   [xss-protection?]
   (-> site-defaults
       (update-in [:session] merge session-defaults)
+      (dissoc :static)
       (assoc-in [:security :anti-forgery] xss-protection?)))
 
 
diff --git a/src/smeagol/middleware.clj b/src/smeagol/middleware.clj
index aa14cb2..92cfac0 100644
--- a/src/smeagol/middleware.clj
+++ b/src/smeagol/middleware.clj
@@ -50,9 +50,9 @@
 
 (def production-middleware
   [#(wrap-internal-error % :log (fn [e] (timbre/error e)))
+   #(wrap-resource % "public")
    #(wrap-file % util/content-dir
                {:index-files? false :prefer-handler? true})
-   #(wrap-resource % "public")
    #(wrap-content-type %)
    #(wrap-not-modified %)])