diff --git a/zone/data_bucket.cpp b/zone/data_bucket.cpp
index 1f0c377e0..005d4549a 100644
--- a/zone/data_bucket.cpp
+++ b/zone/data_bucket.cpp
@@ -212,7 +212,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 
 				LogDataBuckets("Returning key [{}] value [{}] from cache", e.key_, e.value);
 
-				if (is_nested_key) {
+				if (is_nested_key && !k_.key.empty()) {
 					return ExtractNestedValue(e, k_.key);
 				}
 
@@ -292,7 +292,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 	}
 
 	// Handle nested key extraction
-	if (is_nested_key) {
+	if (is_nested_key && !k_.key.empty()) {
 		return ExtractNestedValue(bucket, k_.key);
 	}