diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index d2ba693aa..183afedae 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -30,6 +30,7 @@ from lib.core.agent import agent
 from lib.core.common import getRange
 from lib.core.common import parsePasswordHash
 from lib.core.common import readInput
+from lib.core.convert import urlencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -1100,6 +1101,8 @@ class Enumeration:
         selectQuery = True
         sqlType     = None
 
+        query = urlencode(query, convall=True)
+
         for sqlTitle, sqlStatements in SQL_STATEMENTS.items():
             for sqlStatement in sqlStatements:
                 if query.lower().startswith(sqlStatement):