diff --git a/src/main/java/com/shallwe/domain/auth/domain/OAuth2Token.java b/src/main/java/com/shallwe/domain/auth/domain/OAuth2Token.java
index 04af16d..b5e303b 100644
--- a/src/main/java/com/shallwe/domain/auth/domain/OAuth2Token.java
+++ b/src/main/java/com/shallwe/domain/auth/domain/OAuth2Token.java
@@ -1,5 +1,6 @@
 package com.shallwe.domain.auth.domain;
 
+import com.shallwe.domain.common.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -12,7 +13,7 @@
 @Table(name = "oauth2_token")
 @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
-public class OAuth2Token {
+public class OAuth2Token extends BaseEntity {
 
     @Id
     @Column(name = "provider_id")
diff --git a/src/main/java/com/shallwe/domain/user/application/UserServiceImpl.java b/src/main/java/com/shallwe/domain/user/application/UserServiceImpl.java
index 3c3b2a9..83b4232 100644
--- a/src/main/java/com/shallwe/domain/user/application/UserServiceImpl.java
+++ b/src/main/java/com/shallwe/domain/user/application/UserServiceImpl.java
@@ -66,6 +66,7 @@ public void inactiveCurrentUser(final UserPrincipal userPrincipal, final PostCom
                     .orElseThrow(InvalidOAuth2RefreshTokenException::new);
 
             appleJwtUtils.revokeToken(oAuth2RefreshToken.getRefreshToken());
+            oAuth2TokenRepository.delete(oAuth2RefreshToken);
         }
 
         if (user.getProvider().equals(Provider.GOOGLE)) {
@@ -86,6 +87,8 @@ public void inactiveCurrentUser(final UserPrincipal userPrincipal, final PostCom
                     .body(body)
                     .retrieve()
                     .toBodilessEntity();
+
+            oAuth2TokenRepository.delete(oAuth2RefreshToken);
         }
 
         if (user.getProvider().equals(Provider.KAKAO)) {
@@ -104,7 +107,7 @@ public void inactiveCurrentUser(final UserPrincipal userPrincipal, final PostCom
                     .toBodilessEntity();
         }
 
-        RefreshToken refreshToken = refreshTokenRepository.findByProviderId(user.getEmail())
+        RefreshToken refreshToken = refreshTokenRepository.findByProviderId(user.getProviderId())
                 .orElseThrow(InvalidTokenException::new);
 
         user.updateStatus(Status.DELETE);