diff --git a/lib/core/common.py b/lib/core/common.py
index a0ecd9ac4..e564bea90 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -3209,16 +3209,11 @@ def decodeHexValue(value):
             if value.lower().startswith("0x"):
                 value = value[2:]
             value = value.decode("hex")
-            if len(value) > 1 and value[1] == '\x00':
+            if Backend.isDbms(DBMS.MSSQL):
                 try:
                     value = value.decode("utf-16-le")
                 except UnicodeDecodeError:
                     pass
-            elif value and value[0] == '\x00':
-                try:
-                    value = value.decode("utf-16-be")
-                except UnicodeDecodeError:
-                    pass
             if not isinstance(value, unicode):
                 value = value.decode("utf8", "replace")
         return value