diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs
index 6053fab2..60b02432 100644
--- a/server/AyaNova/util/License.cs
+++ b/server/AyaNova/util/License.cs
@@ -430,10 +430,15 @@ namespace AyaNova.Core
             log.LogDebug($"Fetching license for DBID {DbId.ToString()}");
             string sUrl = $"{LICENSE_SERVER_URL}rvf/{DbId.ToString()}";
 
-#if (DEBUG)
-            log.LogInformation("DEBUG MODE TRIAL LICENSE KEY BEING FETCHED");
-            sUrl = $"{LICENSE_SERVER_URL}rvf/{TEST_TRIAL_KEY_DBID.ToString()}";
-#endif
+            //##########################################################################################################
+            //TODO: RELEASE WARNING: this needs  to be dealt with before production release
+            //
+            if (ServerBootConfig.AYANOVA_SERVER_TEST_MODE)
+            {
+                log.LogInformation("TEST MODE TRIAL LICENSE KEY BEING FETCHED");
+                sUrl = $"{LICENSE_SERVER_URL}rvf/{TEST_TRIAL_KEY_DBID.ToString()}";
+            }
+            //##########################################################################################################
 
             try
             {