diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 1ac785f11..dbb6ded6b 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1395,7 +1395,7 @@ class Enumeration:
                         value = inject.getValue(query, blind=False)
 
                     if column == colList[0]:
-                        if isNoneValue(value):
+                        if isNoneValue(value) or not value:
                             breakRetrieval = True
                             break
                         else:
@@ -1411,6 +1411,8 @@ class Enumeration:
                             breakRetrieval = True
                             break
 
+                    value = "" if isNoneValue(value) else value
+
                     lengths[column] = max(lengths[column], len(value) if value else 0)
                     entries[column].append(value)