diff --git a/library/defines.php b/library/defines.php
index 3c8bcae60..757e9e7fe 100644
--- a/library/defines.php
+++ b/library/defines.php
@@ -86,7 +86,7 @@ ini_set('display_startup_errors', 1); // Show startup php errors
 define('MYSQLI_ERROR_REPORTING', MYSQLI_REPORT_ERROR); // MySQL error reporting mode | https://www.php.net/manual/mysqli-driver.report-mode.php
 ini_set('log_errors', 1); // php native logging
 ini_set('error_log', LOG_DIR . '/php_errors.log'); // path to log file enabled only if log_errors == 1 (native)
-define('WHOOPS_LOG_FILE', LOG_DIR . '/php_whoops.log'); // log file enabled only if log_errors == 1 (whoops)
+define('WHOOPS_LOG_FILE', LOG_DIR . '/php_whoops.log'); // log file enabled only if log_errors == 1 and APP_DEBUG == true (whoops)
 
 // Triggers
 define('BB_ENABLED', TRIGGERS_DIR . '/$on');
diff --git a/src/Dev.php b/src/Dev.php
index 7a3f7ccbd..3191efe7f 100644
--- a/src/Dev.php
+++ b/src/Dev.php
@@ -43,21 +43,11 @@ class Dev
      */
     public static function initDebug(): void
     {
-        global $bb_cfg;
-
         self::$envType = env('APP_ENV', 'local');
 
         if (self::$envType === 'production') {
-            if (!$bb_cfg['bugsnag']['enabled']) {
-                return;
-            }
-
             self::getBugsnag();
         } else {
-            if (!APP_DEBUG) {
-                return;
-            }
-
             self::getWhoops();
         }
     }
@@ -71,6 +61,10 @@ class Dev
     {
         global $bb_cfg;
 
+        if (!$bb_cfg['bugsnag']['enabled']) {
+            return;
+        }
+
         $bugsnag = Client::make($bb_cfg['bugsnag']['api_key']);
         Handler::register($bugsnag);
     }
@@ -82,6 +76,10 @@ class Dev
      */
     private static function getWhoops(): void
     {
+        if (!APP_DEBUG) {
+            return;
+        }
+
         $whoops = new Run;
 
         /**