diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc
index 5090e4e6b..01c6e051b 100644
--- a/nping/NpingOps.cc
+++ b/nping/NpingOps.cc
@@ -3078,6 +3078,7 @@ bool NpingOps::echoPayload(){
  * or false to disable. */
 int NpingOps::echoPayload(bool value){
   this->echo_payload=value;
+  this->echo_payload_set=true;
   return OP_SUCCESS;
 }
 
diff --git a/nping/NpingOps.h b/nping/NpingOps.h
index 2863d1d6b..f1ac4f5bf 100644
--- a/nping/NpingOps.h
+++ b/nping/NpingOps.h
@@ -718,6 +718,7 @@ class NpingOps {
     bool do_crypto;
 
     bool echo_payload;
+    bool echo_payload_set;   
 
     bool echo_server_once;
     bool echo_server_once_set;