diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 78d9c277e74..0b1bd1baa1a 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -90,7 +90,7 @@ class StaticController < ApplicationController
     expires_in 1.year, public: true
 
     response.headers["Expires"] = 1.year.from_now.httpdate
-    response.headers["Access-Control-Allow-Origin"] = params[:origin]
+    response.headers["Access-Control-Allow-Origin"] = params[:origin] if params[:origin]
 
     begin
       response.headers["Last-Modified"] = File.ctime(path).httpdate