diff --git a/src/discovery/client/discovery_client.cc b/src/discovery/client/discovery_client.cc
index 2931e89113e..cd4c63da2a6 100644
--- a/src/discovery/client/discovery_client.cc
+++ b/src/discovery/client/discovery_client.cc
@@ -487,11 +487,13 @@ void DiscoveryServiceClient::ReEvaluatePublish(std::string serviceName,
             stringstream ss;
             impl->PrintDoc(ss);
             resp->publish_msg_ = ss.str();
+
+            DISCOVERY_CLIENT_TRACE(DiscoveryClientMsg, resp->publish_hdr_,
+                                   serviceName, resp->publish_msg_);
         }
 
-        /* Send publish unconditionally */
-        DISCOVERY_CLIENT_TRACE(DiscoveryClientMsg, resp->publish_hdr_,
-                               serviceName, resp->publish_msg_);
+        resp->pub_sent_++;
+        resp->publish_cb_called_ = false;
         SendHttpPostMessage(resp->publish_hdr_, serviceName,
                             resp->publish_msg_);
     }
@@ -564,6 +566,7 @@ void DiscoveryServiceClient::Publish(std::string serviceName) {
 
         DSPublishResponse *resp = loc->second;
         resp->pub_sent_++; 
+        resp->publish_cb_called_ = false;
         SendHttpPostMessage(resp->publish_hdr_, serviceName, resp->publish_msg_);
 
         DISCOVERY_CLIENT_TRACE(DiscoveryClientMsg, resp->publish_hdr_, 
@@ -661,6 +664,7 @@ void DiscoveryServiceClient::Subscribe(std::string serviceName, uint8_t numbOfIn
         DSResponseHeader *resp = loc->second;
         resp->subscribe_timer_->Cancel();
         resp->sub_sent_++;
+        resp->subscribe_cb_called_ = false;
         SendHttpPostMessage("subscribe", serviceName, resp->subscribe_msg_);
     }
 }