diff --git a/project/settings.py b/project/settings.py
index 9572ee2b..a56c9463 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -406,7 +406,7 @@ except ImportError:
 
 # CORS settings
 
-if DEBUG:
+if DEBUG or DEV_SERVER:
     CORS_ORIGIN_ALLOW_ALL = True
 else:
     CORS_ORIGIN_WHITELIST = os.getenv(