diff --git a/lib/core/option.py b/lib/core/option.py
index 896446cd0..975969ece 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1846,7 +1846,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.permissionFlag = False
     kb.postHint = None
     kb.postSpaceToPlus = False
-    kb.postUrlEncode = True
+    kb.postUrlEncode = False
     kb.prependFlag = False
     kb.processResponseCounter = 0
     kb.previousMethod = None
diff --git a/lib/core/target.py b/lib/core/target.py
index c1bf921bd..722244944 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -683,10 +683,13 @@ def initTargetEnv():
         class _(unicode):
             pass
 
+        kb.postUrlEncode = False
+
         for key, value in conf.httpHeaders:
             if key.upper() == HTTP_HEADER.CONTENT_TYPE.upper():
                 kb.postUrlEncode = "urlencoded" in value
                 break
+
         if kb.postUrlEncode:
             original = conf.data
             conf.data = _(urldecode(conf.data))