diff --git a/src/app/meetup/[groupId]/page.tsx b/src/app/meetup/[groupId]/page.tsx
index 99657cf3..a8601bc4 100644
--- a/src/app/meetup/[groupId]/page.tsx
+++ b/src/app/meetup/[groupId]/page.tsx
@@ -58,7 +58,8 @@ const MeetupDetailPage = ({ params }: Props) => {
         conditions={{
           isHost,
           isJoined,
-          isButtonDisabled: participantCount >= maxParticipants || isPast,
+          isPast,
+          isAttendDisabled: participantCount >= maxParticipants,
         }}
         groupId={groupId}
       />
diff --git a/src/components/pages/meetup/meetup-buttons/index.tsx b/src/components/pages/meetup/meetup-buttons/index.tsx
index 2f64d3e2..7aa073b5 100644
--- a/src/components/pages/meetup/meetup-buttons/index.tsx
+++ b/src/components/pages/meetup/meetup-buttons/index.tsx
@@ -11,13 +11,14 @@ interface Props {
   conditions: {
     isJoined: GetGroupDetailsResponse['userStatus']['isJoined'];
     isHost: boolean;
-    isButtonDisabled: boolean;
+    isPast: boolean;
+    isAttendDisabled: boolean;
   };
   groupId: string;
 }
 
 export const MeetupButtons = ({
-  conditions: { isJoined, isHost, isButtonDisabled },
+  conditions: { isJoined, isHost, isPast, isAttendDisabled },
   groupId,
 }: Props) => {
   const { open } = useModal();
@@ -42,13 +43,13 @@ export const MeetupButtons = ({
           >
             {isHost ? '모임 취소' : '모임 탈퇴'}
           </Button>
-          <Button className='flex-2' disabled={isButtonDisabled} onClick={onEnterChatClick}>
+          <Button className='flex-2' disabled={isPast} onClick={onEnterChatClick}>
             채팅 입장
           </Button>
         </div>
       ) : (
         <Button
-          disabled={isButtonDisabled}
+          disabled={isAttendDisabled || isPast}
           onClick={() => open(<MeetupModal groupId={groupId} type='attend' />)}
         >
           참여하기