diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
index 62752d42..0ffb914e 100644
--- a/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
@@ -120,7 +120,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.";
 
         string username = await this.database.UsernameFromGameToken(token);
 
-        Logger.Info($"{username}: {message} / {scannedText}", LogArea.Filter);
+        if (ServerConfiguration.Instance.LogChatFiltering) 
+          Logger.Info($"{username}: {message} / {scannedText}", LogArea.Filter);
 
         return this.Ok(scannedText);
     }
diff --git a/ProjectLighthouse/Configuration/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs
index 729d42c7..f51bd854 100644
--- a/ProjectLighthouse/Configuration/ServerConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs
@@ -23,7 +23,7 @@ public class ServerConfiguration
     // You can use an ObsoleteAttribute instead. Make sure you set it to error, though.
     //
     // Thanks for listening~
-    public const int CurrentConfigVersion = 15;
+    public const int CurrentConfigVersion = 16;
 
     #region Meta
 
@@ -185,6 +185,7 @@ public class ServerConfiguration
     public string AnnounceText { get; set; } = "You are now logged in as %user (id: %id).";
 #endif
     public bool CheckForUnsafeFiles { get; set; } = true;
+    public bool LogChatFiltering { get; set; } = false;
 
     public FilterMode UserInputFilterMode { get; set; } = FilterMode.None;