diff --git a/client/src/pages/Game/states/Waiting/Waiting.jsx b/client/src/pages/Game/states/Waiting/Waiting.jsx
index f1b87dc..8ed9ba5 100644
--- a/client/src/pages/Game/states/Waiting/Waiting.jsx
+++ b/client/src/pages/Game/states/Waiting/Waiting.jsx
@@ -56,7 +56,11 @@ export const Waiting = ({setState}) => {
 
         let last = names.pop();
 
-        return <><span>{names.join(", ")}</span> und <span>{last}</span></>;
+        return <>{names.map((name, index) => {
+            if (index === names.length - 1) return <span>{name}</span>;
+
+            return <><span>{name}</span>, </>;
+        })} und <span>{last}</span></>;
     }
 
     return (