diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/mapper/StoreMapper.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/mapper/StoreMapper.kt
index fc07f881..a9b91b78 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/mapper/StoreMapper.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/mapper/StoreMapper.kt
@@ -50,6 +50,23 @@ object StoreMapper {
             minimumOrderAmount = minimumOrderAmount,
         )
 
+    fun Store.toStoreInfo(distance: Double): StoreInfo =
+        StoreInfo(
+            id = id ?: "unknown",
+            name = name ?: "unknown",
+            imageMain = imageMain ?: "unknown",
+            rating = rating?.toDouble() ?: 0.0, // null이면 0.0 반환
+            reviewCount = reviewCount ?: 0,
+            deliveryTime = distance.calculateDeliveryTime().toString(),
+            deliveryDistance = distance,
+            freeDelivery = true,
+            address = address ?: "unknown",
+            latitude = latitude ?: 0.0,
+            longitude = longitude ?: 0.0,
+            phone = tel ?: "unknown",
+            minimumOrderAmount = minimumOrderAmount,
+        )
+
     private fun Menu.toMenuResponse(): MenuOptionInfo {
         return MenuOptionInfo(
             id = this.id ?: "unknown",
diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/service/StoreService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/service/StoreService.kt
index 2f92c88f..f457d4e7 100644
--- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/service/StoreService.kt
+++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/store/service/StoreService.kt
@@ -207,9 +207,7 @@ class StoreService(
         // 3) 결과를 StoreInfo로 변환
         val content = storeList.map {
             val dist = it.distance.toDoubleOrNull() ?: 0.0
-            val rating = reviewRepository.getTotalAverageScoreByStoreId(it.store.id ?: "")
-            val reviewCount = reviewRepository.countReviewCountByStoreId(it.store.id ?: "").toInt()
-            it.store.toStoreInfo(dist, rating, reviewCount)
+            it.store.toStoreInfo(dist)
         }
 
         return CursorDTOString(