diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index 94d1ddca6..ea4d40ba9 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -1046,7 +1046,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (Debugging.IsUserDebugging) {
+			if (Debugging.IsDebugConfigured) {
 				ASF.ArchiLogger.LogGenericDebug(configFilePath + ": " + JsonConvert.SerializeObject(botConfig, Formatting.Indented));
 			}
 
@@ -1066,7 +1066,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (Debugging.IsUserDebugging) {
+			if (Debugging.IsDebugConfigured) {
 				ASF.ArchiLogger.LogGenericDebug(databaseFilePath + ": " + JsonConvert.SerializeObject(botDatabase, Formatting.Indented));
 			}
 
diff --git a/ArchiSteamFarm/Debugging.cs b/ArchiSteamFarm/Debugging.cs
index 57ee29b9f..de456ccd7 100644
--- a/ArchiSteamFarm/Debugging.cs
+++ b/ArchiSteamFarm/Debugging.cs
@@ -29,7 +29,9 @@ namespace ArchiSteamFarm {
 		internal static bool IsDebugBuild => false;
 #endif
 
-		internal static bool IsUserDebugging => IsDebugBuild || ASF.GlobalConfig.Debug;
+		internal static bool IsDebugConfigured => ASF.GlobalConfig.Debug;
+
+		internal static bool IsUserDebugging => IsDebugBuild || IsDebugConfigured;
 
 		internal sealed class DebugListener : IDebugListener {
 			public void WriteLine(string category, string msg) {
diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs
index c222d4fd2..a23848fdf 100644
--- a/ArchiSteamFarm/Program.cs
+++ b/ArchiSteamFarm/Program.cs
@@ -211,7 +211,7 @@ namespace ArchiSteamFarm {
 
 			ASF.InitGlobalConfig(globalConfig);
 
-			if (Debugging.IsUserDebugging) {
+			if (Debugging.IsDebugConfigured) {
 				ASF.ArchiLogger.LogGenericDebug(globalConfigFile + ": " + JsonConvert.SerializeObject(ASF.GlobalConfig, Formatting.Indented));
 			}
 
@@ -303,7 +303,10 @@ namespace ArchiSteamFarm {
 
 			// If debugging is on, we prepare debug directory prior to running
 			if (Debugging.IsUserDebugging) {
-				ASF.ArchiLogger.LogGenericDebug(globalDatabaseFile + ": " + JsonConvert.SerializeObject(ASF.GlobalDatabase, Formatting.Indented));
+				if (!Debugging.IsDebugBuild) {
+					ASF.ArchiLogger.LogGenericDebug(globalDatabaseFile + ": " + JsonConvert.SerializeObject(ASF.GlobalDatabase, Formatting.Indented));
+				}
+
 				Logging.EnableTraceLogging();
 
 				DebugLog.AddListener(new Debugging.DebugListener());