diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index a8a508ffd..75110ddb4 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -359,8 +359,8 @@ def errorUse(expression, expected=None, dump=False):
                 for field in expressionFieldsList:
                     if __oneShotErrorUse("SELECT COUNT(%s) FROM %s" % (field, kb.dumpTable)) == '0':
                         emptyFields.append(field)
-                        debugMsg = "column '%s' for table '%s' appears to be empty. "
-                        debugMsg += "It's values will not be dumped"
+                        debugMsg = "column '%s' of table '%s' will not be " % (field, kb.dumpTable)
+                        debugMsg += "dumped as it appears to be empty"
                         logger.debug(debugMsg)
 
             if stopLimit > TURN_OFF_RESUME_INFO_LIMIT:
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 6de7b2be7..dc2dd8c7c 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -57,6 +57,7 @@ from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.exception import sqlmapUserQuitException
 from lib.core.session import setOs
 from lib.core.settings import BLANK
+from lib.core.settings import CHECK_ZERO_COLUMNS_THRESHOLD
 from lib.core.settings import CONCAT_ROW_DELIMITER
 from lib.core.settings import CONCAT_VALUE_DELIMITER
 from lib.core.settings import CURRENT_DB
@@ -1717,9 +1718,18 @@ class Enumeration:
                             entries, lengths = retVal
 
                     else:
+                        emptyColumns = []
                         plusOne = Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2)
                         indexRange = getLimitRange(count, dump=True, plusOne=plusOne)
 
+                        if len(colList) < len(indexRange) > CHECK_ZERO_COLUMNS_THRESHOLD:
+                            for column in colList:
+                                if inject.getValue("SELECT COUNT(%s) FROM %s" % (column, kb.dumpTable), inband=False, error=False) == '0':
+                                    emptyColumns.append(column)
+                                    debugMsg = "column '%s' of table '%s' will not be " % (column, kb.dumpTable)
+                                    debugMsg += "dumped as it appears to be empty"
+                                    logger.debug(debugMsg)
+
                         try:
                             for index in indexRange:
                                 for column in colList:
@@ -1743,7 +1753,7 @@ class Enumeration:
                                     elif Backend.isDbms(DBMS.FIREBIRD):
                                         query = rootQuery.blind.query % (index, column, tbl)
 
-                                    value = inject.getValue(query, inband=False, error=False, dump=True)
+                                    value = NULL if column in emptyColumns else inject.getValue(query, inband=False, error=False, dump=True)
 
                                     lengths[column] = max(lengths[column], len(value) if value else 0)
                                     entries[column].append(value)