diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt
index e86dc2b0..1090757e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt
@@ -2,4 +2,6 @@ package dev.usbharu.hideout.core.infrastructure.springframework.security
 
 interface LoginUserContextHolder {
     fun getLoginUserId(): Long
+
+    fun getLoginUserIdOrNull(): Long?
 }
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt
index 0369fda6..2c77a9f9 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt
@@ -11,4 +11,13 @@ class OAuth2JwtLoginUserContextHolder : LoginUserContextHolder {
 
         return principal.getClaim<String>("uid").toLong()
     }
+
+    override fun getLoginUserIdOrNull(): Long? {
+        val principal = SecurityContextHolder.getContext()?.authentication?.principal
+        if (principal !is Jwt) {
+            return null
+        }
+
+        return principal.getClaim<String>("uid").toLongOrNull()
+    }
 }