diff --git a/app/[groupId]/_components/member-list.tsx b/app/[groupId]/_components/member-list.tsx
index 7b9fd944..79159e70 100644
--- a/app/[groupId]/_components/member-list.tsx
+++ b/app/[groupId]/_components/member-list.tsx
@@ -36,7 +36,7 @@ function MemberCard({ member, groupId, isAdmin, teamName }: MemberCardProps) {
       userImage={member.userImage}
       userName={member.userName}
       userEmail={member.userEmail}
-      isAdmin={isAdmin}
+      userRole={member.role}
     />
   ));
 
diff --git a/app/[groupId]/_components/modal/modal-member-profile.tsx b/app/[groupId]/_components/modal/modal-member-profile.tsx
index 5011265e..33e0da42 100644
--- a/app/[groupId]/_components/modal/modal-member-profile.tsx
+++ b/app/[groupId]/_components/modal/modal-member-profile.tsx
@@ -11,7 +11,7 @@ interface ModalMemberProfileProps {
   userImage: string;
   userName: string;
   userEmail: string;
-  isAdmin: boolean;
+  userRole: string;
 }
 
 function ModalMemberProfile({
@@ -19,7 +19,7 @@ function ModalMemberProfile({
   userImage,
   userName,
   userEmail,
-  isAdmin,
+  userRole,
 }: ModalMemberProfileProps) {
   const handleButtonClick = async () => {
     try {
@@ -61,7 +61,7 @@ function ModalMemberProfile({
 
             <div className="flex flex-col items-center justify-center gap-[8px]">
               <div className="flex items-center gap-[4px]">
-                {isAdmin && (
+                {userRole === "ADMIN" && (
                   <Image src={Crown} alt="왕관" width={20} height={20} />
                 )}
 
diff --git a/app/[groupId]/_components/modal/modal-task-list-name-edit.tsx b/app/[groupId]/_components/modal/modal-task-list-name-edit.tsx
index b74f7e2a..6c9c94f3 100644
--- a/app/[groupId]/_components/modal/modal-task-list-name-edit.tsx
+++ b/app/[groupId]/_components/modal/modal-task-list-name-edit.tsx
@@ -119,7 +119,11 @@ function ModalTaskListNameEdit({
               <Button
                 btnSize="large"
                 btnStyle="solid"
-                disabled={!isDirty || editTaskListMutation.isPending}
+                disabled={
+                  !isDirty ||
+                  !taskListName.trim() ||
+                  editTaskListMutation.isPending
+                }
               >
                 {editTaskListMutation.isPending ? "수정 중..." : "수정하기"}
               </Button>