diff --git a/lib/core/agent.py b/lib/core/agent.py
index c2f3f098b..9f1ff26f4 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -189,6 +189,9 @@ class Agent:
 
         expression = self.cleanupPayload(expression)
 
+        # User supplied --suffix nullifies any eventual payload comments
+        comment = None if conf.suffix is not None and suffix == conf.suffix else comment
+
         if Backend.getIdentifiedDbms() == DBMS.ACCESS and comment == GENERIC_SQL_COMMENT:
             comment = "%00"