diff --git a/lib/core/unescaper.py b/lib/core/unescaper.py
index 53ca6fbe9..9f17ab289 100644
--- a/lib/core/unescaper.py
+++ b/lib/core/unescaper.py
@@ -6,11 +6,15 @@ See the file 'doc/COPYING' for copying permission
 """
 
 from lib.core.common import Backend
+from lib.core.data import conf
 from lib.core.datatype import AttribDict
 from lib.core.settings import EXCLUDE_UNESCAPE
 
 class Unescaper(AttribDict):
     def unescape(self, expression, quote=True, dbms=None):
+        if not conf.unescape:
+            return expression
+
         if expression is None:
             return expression