diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt b/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt
index 2393dff..0ec16ac 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt
@@ -66,11 +66,9 @@ class TokenProvider(
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
             val memberToken = tokenRepository.findByIdOrNull(memberId)
-                ?: MemberToken(id = memberId, tokenList = mutableListOf())
+                ?: MemberToken(id = memberId)
 
-            val memberTokenSet = memberToken.tokenList.toMutableSet()
-            memberTokenSet.add(token)
-            memberToken.tokenList = memberTokenSet.toMutableList()
+            memberToken.tokenSet.add(token)
             tokenRepository.save(memberToken)
         }
 
@@ -89,7 +87,7 @@ class TokenProvider(
         val memberToken = tokenRepository.findByIdOrNull(id = claims.subject.toLong())
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
-        if (!memberToken.tokenList.contains(token)) throw SodaException("로그인 정보를 확인해주세요.")
+        if (!memberToken.tokenSet.contains(token)) throw SodaException("로그인 정보를 확인해주세요.")
 
         val member = repository.findByIdOrNull(id = claims.subject.toLong())
             ?: throw SodaException("로그인 정보를 확인해주세요.")
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
index 3dc8967..a916159 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
@@ -371,9 +371,7 @@ class MemberService(
             val memberToken = tokenRepository.findByIdOrNull(memberId)
                 ?: throw SodaException("로그인 정보를 확인해주세요.")
 
-            val memberTokenSet = memberToken.tokenList.toMutableSet()
-            memberTokenSet.remove(token)
-            memberToken.tokenList = memberTokenSet.toMutableList()
+            memberToken.tokenSet.remove(token)
             tokenRepository.save(memberToken)
         }
     }
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt
index 1027928..1af6273 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt
@@ -7,5 +7,5 @@ import org.springframework.data.redis.core.RedisHash
 data class MemberToken(
     @Id
     val id: Long,
-    var tokenList: MutableList<String>
+    var tokenSet: MutableSet<String> = mutableSetOf()
 )