diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java
index e2496fb..da1d6ef 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/obp/ObpGwMetricService.java
@@ -23,11 +23,10 @@ public class ObpGwMetricService {
     }
 
     /**
-     * UPSERT 판단을 위한 기존 데이터 조회
+     * UPSERT 판단을 위한 기존 데이터 조회 (NULL 안전)
      */
     public Optional<ObpGwMetric> findByUniqueKey(LocalDateTime timeslice, String apiId, String clientId, String hostname, String orgId) {
-        return repository.findByTimesliceAndApiIdAndClientIdAndHostnameAndOrgId(
-                timeslice, apiId, clientId, hostname, orgId);
+        return repository.findByUniqueKeyNullSafe(timeslice, apiId, clientId, hostname, orgId);
     }
 
     /**