diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
index af7decbd02..78469e6c91 100644
--- a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
@@ -121,7 +121,7 @@ interface ChatComponent {
                 }
             }
 
-            return LegacyComponentReader.parse(parent, string, restricted).trim() ?: EmptyComponent
+            return LegacyComponentReader.parse(parent, string.removeSurrounding("\""), restricted).trim() ?: EmptyComponent
         }
 
         fun String.chat(): ChatComponent {
diff --git a/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt b/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt
index b86e7050e8..d2394e9bbd 100644
--- a/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt
+++ b/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt
@@ -319,12 +319,16 @@ internal class ChatComponentTest {
     }
 
     @Test
-    fun something() { // tree.ac
+    fun `remove quotes around legacy text`() { // tree.ac
         val string = """"§2Join the Other Server? Find it at §6Port 25566§2!""""
-        val chat = ChatComponent.of(string)
-
-        TODO()
+        val text = ChatComponent.of(string)
 
+        val expected = BaseComponent(
+            TextComponent("Join the Other Server? Find it at ").color(ChatColors.DARK_GREEN),
+            TextComponent("Port 25566").color(ChatColors.GOLD),
+            TextComponent("!").color(ChatColors.DARK_GREEN),
+        )
+        assertEquals(text, expected)
     }
 
     private fun assertEquals(expected: ChatComponent, actual: ChatComponent) {