diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 9e831e46b..444227e3a 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -796,7 +796,7 @@ class Enumeration:
                 infoMsg += "database '%s'" % db
                 logger.info(infoMsg)
 
-                if kb.dbms in (DBMS.SQLITE, DBMS.FIREBIRD):
+                if kb.dbms in (DBMS.SQLITE, DBMS.FIREBIRD, DBMS.MAXDB):
                     query = rootQuery.blind.count
                 else:
                     query = rootQuery.blind.count % db
@@ -819,6 +819,8 @@ class Enumeration:
                 for index in indexRange:
                     if kb.dbms == DBMS.SYBASE:
                         query = rootQuery.blind.query % (db, (kb.data.cachedTables[-1] if kb.data.cachedTables else " "))
+                    elif kb.dbms == DBMS.MAXDB:
+                        query = rootQuery.blind.query % (kb.data.cachedTables[-1] if kb.data.cachedTables else " ")
                     elif kb.dbms in (DBMS.SQLITE, DBMS.FIREBIRD):
                         query = rootQuery.blind.query % index
                     else:
diff --git a/xml/queries.xml b/xml/queries.xml
index 3e3014c52..1eae79eda 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -440,6 +440,7 @@
         </users>
         <tables>
             <inband query="SELECT tablename FROM domain.tables WHERE schemaname='%s' AND type='TABLE'"/>
+            <blind query="SELECT MIN(tablename) FROM domain.tables WHERE schemaname=user AND type='TABLE' AND name > '%s'" count="SELECT CHR(COUNT(*)) FROM domain.tables WHERE schemaname=user AND type='TABLE'"/>
         </tables>
         <roles>
             <inband query="SELECT owner, role FROM domain.roles" condition="owner"/>