diff --git a/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java b/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java
index c3606e3f..397349fa 100644
--- a/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java
+++ b/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java
@@ -636,7 +636,12 @@ private <T> CompletableFuture<T> doAsyncGet(EVCacheKey evcKey, Transcoder<T> tc)
                         }
                     } else {
                         handleFinally(data, status, retryCount.get(), client, cacheOperation, start, Call.COMPLETABLE_FUTURE_GET);
-                        handleData(data, event, evcKey, client, cacheOperation);
+                        // Fix: Check if data is null before determining hit/miss
+                        if (data != null) {
+                            handleData(data, event, evcKey, client, cacheOperation);  // HIT
+                        } else {
+                            handleMissData(event, evcKey, client, cacheOperation);    // MISS
+                        }
                         return data;
                     }
                 });