diff --git a/server/api/AdminAPI.js b/server/api/AdminAPI.js
index 777e1e7..e5fe38a 100644
--- a/server/api/AdminAPI.js
+++ b/server/api/AdminAPI.js
@@ -4,9 +4,19 @@ const debugMode = Array.from(process.argv.map((arg) => arg.trim().toLowerCase())
 const logger = require('../modules/Logger')(debugMode);
 const eventManager = (require('../modules/singletons/EventManager.js')).instance;
 const cors = require('cors');
-const { CORS_OPTIONS, CONTENT_TYPE_VALIDATOR } = require('../config/globals');
+const { CONTENT_TYPE_VALIDATOR } = require('../config/globals');
 
-router.use(cors(CORS_OPTIONS));
+router.use(cors(
+    (process.env.NODE_ENV?.trim() === 'development'
+        ? {
+            origin: '*',
+            optionsSuccessStatus: 200
+        }
+        : {
+            origin: 'http://localhost:3000',
+            optionsSuccessStatus: 200
+        })
+));
 
 router.post('/sockets/broadcast', (req, res, next) => {
     CONTENT_TYPE_VALIDATOR(req, res, next);