diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java
index dfe76809..4114c9a3 100644
--- a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java
+++ b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java
@@ -4,6 +4,8 @@
 import static kr.co.fastcampus.yanabada.domain.member.entity.RoleType.ROLE_USER;
 
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Random;
 import kr.co.fastcampus.yanabada.common.exception.EmailDuplicatedException;
 import kr.co.fastcampus.yanabada.common.jwt.dto.TokenIssueResponse;
@@ -157,16 +159,19 @@ private void setTokenInCookie(
     private void setValueInCookie(
         HttpServletResponse response, String key, String value
     ) {
-        log.info("domain={}", domain);
-        ResponseCookie cookie = ResponseCookie
-            .from(key, value)
-            .httpOnly(true)
-            .secure(secure)
-            .path("/")
-            .sameSite("None")
-            .domain(domain)
-            .build();   //todo: domain 서브도메인 맞추기
-        response.addHeader("Set-Cookie", cookie.toString());
+        try {
+            ResponseCookie cookie = ResponseCookie
+                .from(key, URLEncoder.encode(value, "UTF-8"))
+                .httpOnly(true)
+                .secure(secure)
+                .path("/")
+                .sameSite("None")
+                .domain(domain)
+                .build();
+            response.addHeader("Set-Cookie", cookie.toString());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Transactional
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b2590613..545c87d9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,7 +52,7 @@ spring:
 
   cookie:
     secure: false
-    domain: yanabada-fe-1r96.vercel.app
+    domain: null
 
 jwt:
   secretKey: yanabadaSecretKeyyanabadaSecretKeyyanabadaSecretKey