diff --git a/src/components/ui/card/cardList/GameRoomCard.tsx b/src/components/ui/card/cardList/GameRoomCard.tsx
index 7db04fb..f5d0b23 100644
--- a/src/components/ui/card/cardList/GameRoomCard.tsx
+++ b/src/components/ui/card/cardList/GameRoomCard.tsx
@@ -1,21 +1,26 @@
+import { IGameRoom } from "../../../../api/gameRoomApi";
 import { useJoinGameRoomMutation } from "../../../../hooks/useMutation";
-import { useRoomIdStore } from "../../../../store/useRoomIdStore";
 import Badge from "../../badge/Badge";
 import Button from "../../button/Button";
 import * as S from "./GameRoomCardStyle";
 
-export default function GameRoomCard({ room }: { room: IRoomProps }) {
-  const { setRoomId } = useRoomIdStore();
+export default function GameRoomCard({ room }: { room: IGameRoom }) {
   const disabled = room.currentCount === 2 ? true : false;
   const mutation = useJoinGameRoomMutation();
   const onClickJoin = (roomId: number) => {
-    setRoomId(roomId);
     mutation.mutate(roomId);
   };
 
+  const roomState = () => {
+    if (room.currentCount === 1) {
+      return "waiting...";
+    } else if (room.currentCount === 2) {
+      return "playing";
+    }
+  };
   return (
     <S.cardContainer>
-      <Badge playerNumber={room.currentCount} />
+      <Badge playerNumber={room.currentCount} status={roomState()} />
       <S.titleBox>{room.roomName}</S.titleBox>
       <S.buttonContainer>
         <Button