diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java
index 0d5d0e643..dbff5e8c3 100644
--- a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java
+++ b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java
@@ -170,7 +170,8 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
             flagOptions = options;
         }
 
-        hookSupportData.hints = Collections.unmodifiableMap(flagOptions.getHookHints());
+        var hookHints = flagOptions.getHookHints();
+        hookSupportData.hints = hookHints.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(hookHints);
         var context = new LayeredEvaluationContext(
                 openfeatureApi.getEvaluationContext(),
                 openfeatureApi.getTransactionContext(),