diff --git a/src/chttpd_cors.erl b/src/chttpd_cors.erl
index e0e8fd0..b109b45 100644
--- a/src/chttpd_cors.erl
+++ b/src/chttpd_cors.erl
@@ -288,6 +288,12 @@
 
 
 is_cors_enabled(Config) ->
+    case get(disable_couch_httpd_cors) of
+        undefined ->
+            put(disable_couch_httpd_cors, true);
+        _ ->
+            ok
+    end,
     couch_util:get_value(<<"enable_cors">>, Config, false).