diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
index 136995791..8c4f23c24 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
@@ -82,8 +82,8 @@ public class HSQLDictionary extends DBDictionary {
 
         doubleTypeName = "NUMERIC";
 
-        supportsNullTableForGetPrimaryKeys = true;
-        supportsNullTableForGetIndexInfo = true;
+        supportsNullTableForGetPrimaryKeys = false;
+        supportsNullTableForGetIndexInfo = false;
 
         requiresCastForMathFunctions = true;
         requiresCastForComparisons = true;