diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java
index 86364d92..44999a1c 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/token/service/TokenService.java
@@ -58,9 +58,6 @@ public void updateRefreshToken(Long userId, String oldRefreshToken, String newRe
             throw new TokenBadRequestException(); // 400
         }
 
-        // 기존 토큰 삭제 및 새 토큰 저장
-        tokenRepository.delete(token);
-        Token newToken = Token.toEntity(token.getUser(), newRefreshToken, LocalDateTime.now().plusDays(30));
-        tokenRepository.save(newToken);
+        token.updateRefreshToken(newRefreshToken, LocalDateTime.now().plusDays(30));
     }
 }
diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java
index bc04bc11..fc6a99e2 100644
--- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java
+++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java
@@ -5,13 +5,11 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nowait.applicationuser.security.jwt.JwtUtil;
 import com.nowait.applicationuser.token.dto.AuthenticationResponse;
-import com.nowait.applicationuser.token.dto.RefreshTokenRequest;
 import com.nowait.applicationuser.token.service.TokenService;
 
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/service/TokenService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/service/TokenService.java
index 0b023a15..eee87b82 100644
--- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/service/TokenService.java
+++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/service/TokenService.java
@@ -58,8 +58,6 @@ public void updateRefreshToken(Long userId, String oldRefreshToken, String newRe
         }
 
         // 기존 토큰 삭제 및 새 토큰 저장
-        tokenRepository.delete(token);
-        Token newToken = Token.toEntity(token.getUser(), newRefreshToken, LocalDateTime.now().plusDays(30));
-        tokenRepository.save(newToken);
+        token.updateRefreshToken(newRefreshToken, LocalDateTime.now().plusDays(30));
     }
 }