diff --git a/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java b/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java
index 8c53b237..8cb8e91c 100755
--- a/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java
+++ b/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java
@@ -1,19 +1,21 @@
 package org.sopt.app.application.playground;
 
+
 import feign.HeaderMap;
 import feign.Param;
 import feign.RequestLine;
+import java.util.List;
+import java.util.Map;
 import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.RefreshedToken;
 import org.sopt.app.application.playground.dto.PlaygroundPostInfo.PlaygroundPostResponse;
 import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.*;
 import org.sopt.app.application.playground.dto.PlaygroundUserFindCondition;
 import org.sopt.app.application.playground.dto.RecommendedFriendInfo.PlaygroundUserIds;
 import org.sopt.app.presentation.auth.AppAuthRequest;
-
-import java.util.List;
-import java.util.Map;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.web.bind.annotation.RequestBody;
 
+@EnableFeignClients
 public interface PlaygroundClient {
 
     @RequestLine("POST /api/v1/idp/sso/auth")
diff --git a/src/main/java/org/sopt/app/application/poke/PokeService.java b/src/main/java/org/sopt/app/application/poke/PokeService.java
index 7e4c84f8..3c40c85e 100755
--- a/src/main/java/org/sopt/app/application/poke/PokeService.java
+++ b/src/main/java/org/sopt/app/application/poke/PokeService.java
@@ -51,16 +51,14 @@ private PokeHistory createPokeByApplyingReply(
         );
 
         if (!latestPokeFromPokedIsReplyFalse.isEmpty()) {
-            latestPokeFromPokedIsReplyFalse.get(0).activateReply();
+            latestPokeFromPokedIsReplyFalse.getFirst().activateReply();
         }
-
-        PokeHistory createdPoke = PokeHistory.builder()
+        return historyRepository.save(PokeHistory.builder()
                 .pokerId(pokerUserId)
                 .pokedId(pokedUserId)
                 .message(pokeMessage)
                 .isReply(false)
                 .isAnonymous(isAnonymous)
-                .build();
-        return historyRepository.save(createdPoke);
+                .build());
     }
 }
diff --git a/src/main/java/org/sopt/app/domain/entity/Friend.java b/src/main/java/org/sopt/app/domain/entity/Friend.java
index db2d8895..13c58aa1 100755
--- a/src/main/java/org/sopt/app/domain/entity/Friend.java
+++ b/src/main/java/org/sopt/app/domain/entity/Friend.java
@@ -13,7 +13,6 @@
 public class Friend extends BaseEntity {
 
     @Id
-    @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
diff --git a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java
index 11860133..6393bab5 100755
--- a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java
+++ b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java
@@ -1,6 +1,10 @@
 package org.sopt.app.domain.entity.poke;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -18,7 +22,6 @@ public class PokeHistory extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @NotNull
     private Long id;
 
     @NotNull
diff --git a/src/main/java/org/sopt/app/domain/entity/poke/PokeMessage.java b/src/main/java/org/sopt/app/domain/entity/poke/PokeMessage.java
index 9bf0d090..76885355 100755
--- a/src/main/java/org/sopt/app/domain/entity/poke/PokeMessage.java
+++ b/src/main/java/org/sopt/app/domain/entity/poke/PokeMessage.java
@@ -20,7 +20,6 @@ public class PokeMessage extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @NotNull
     private Long id;
 
     @NotNull
diff --git a/src/main/java/org/sopt/app/facade/PokeFacade.java b/src/main/java/org/sopt/app/facade/PokeFacade.java
index f2dbc77b..3bd29155 100755
--- a/src/main/java/org/sopt/app/facade/PokeFacade.java
+++ b/src/main/java/org/sopt/app/facade/PokeFacade.java
@@ -98,7 +98,7 @@ public Long pokeFriend(Long pokerUserId, Long pokedUserId, String pokeMessage, B
         pokeHistoryService.checkDuplicate(pokerUserId, pokedUserId);
         PokeHistory newPoke = pokeService.poke(pokerUserId, pokedUserId, pokeMessage, isAnonymous);
 
-        this.applyFriendship(pokerUserId, pokedUserId);
+        applyFriendship(pokerUserId, pokedUserId);
         return newPoke.getId();
     }