diff --git a/lib/core/agent.py b/lib/core/agent.py
index 61fdff7cd73..6213935e962 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -142,7 +142,7 @@ def payload(self, place=None, parameter=None, value=None, newValue=None, where=N
         elif place in (PLACE.USER_AGENT, PLACE.REFERER, PLACE.HOST):
             retVal = paramString.replace(origValue, self.addPayloadDelimiters(newValue))
         else:
-            retVal = re.sub(r"(\A|\b)%s=%s" % (parameter, origValue), "%s=%s" % (parameter, self.addPayloadDelimiters(newValue)), paramString)
+            retVal = re.sub(r"(\A|\b)%s=%s" % (re.escape(parameter), re.escape(origValue)), "%s=%s" % (parameter, self.addPayloadDelimiters(newValue)), paramString)
 
         return retVal