diff --git a/octgnFX/Octgn.JodsEngine/Play/State/GameEngine.cs b/octgnFX/Octgn.JodsEngine/Play/State/GameEngine.cs
index 6ff3a41eb..731aafec5 100644
--- a/octgnFX/Octgn.JodsEngine/Play/State/GameEngine.cs
+++ b/octgnFX/Octgn.JodsEngine/Play/State/GameEngine.cs
@@ -503,7 +503,7 @@ public void OnStart() {
                 return;
             }
 
-            Program.GameEngine.History.Name = _gameName;
+            Program.GameEngine.History.Name = string.Concat(_gameName.Split(Path.GetInvalidFileNameChars()));
 
             if (_historyPath == null) {
                 var dir = new DirectoryInfo(Config.Instance.Paths.GameHistoryPath);
diff --git a/recentchanges.txt b/recentchanges.txt
index 8b1378917..b62658e6d 100644
--- a/recentchanges.txt
+++ b/recentchanges.txt
@@ -1 +1 @@
-
+Fixed a bug causing OCTGN to hang if trying to join a game with invalid characters in the lobby name