diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 4d6ddde96..b62fd03b7 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -64,6 +64,11 @@ class StaticController < ApplicationController
     path = (Rails.root + "public/assets/" + path).to_s
     expires_in 1.year, public: true
     response.headers["Access-Control-Allow-Origin"] = params[:origin]
+    begin
+      response.headers["Last-Modified"] = File.ctime(path).httpdate
+    rescue Errno::ENOENT
+      raise Discourse::NotFound
+    end
     opts = {
       disposition: nil
     }
diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb
index 66a2b86cf..5d486229c 100644
--- a/config/initializers/06-mini_profiler.rb
+++ b/config/initializers/06-mini_profiler.rb
@@ -27,6 +27,7 @@ if defined?(Rack::MiniProfiler)
     (path !~ /qunit/) &&
     (path !~ /srv\/status/) &&
     (path !~ /commits-widget/) &&
+    (path !~ /^\/cdn_asset/) &&
     (path !~ /^\/logs/)
   end