diff --git a/lib/core/agent.py b/lib/core/agent.py
index 69f016274..bfde2a466 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -636,7 +636,7 @@ class Agent:
                 regObj = getCompiledRegex("(?P<result>%s.*?%s)" % (PAYLOAD_DELIMITER, PAYLOAD_DELIMITER))
 
                 for match in regObj.finditer(inpStr):
-                    retVal = retVal.replace(match.group("result"), match.group("result").strip(PAYLOAD_DELIMITER))
+                    retVal = retVal.replace(match.group("result"), urlencode(match.group("result").strip(PAYLOAD_DELIMITER), convall=True))
             else:
                 retVal = retVal.replace(PAYLOAD_DELIMITER, '')