diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
index b59450e1a..b9cd4a5a1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
@@ -451,7 +451,7 @@ public class ProductDerivations {
         // most specific to least
         for (int i = _derivations.length - 1; i >= 0; i--) {
             Set<String> members = _derivations[i].getSupportedQueryHints();
-            if (members != null || !members.isEmpty())
+            if (members != null && !members.isEmpty())
                 result.addAll(members);
         }
         return result;