diff --git a/server/stream_server.cpp b/server/stream_server.cpp
index c4b8cf0a..85789bbc 100644
--- a/server/stream_server.cpp
+++ b/server/stream_server.cpp
@@ -628,9 +628,8 @@ void StreamServer::onMessageReceived(StreamSession* streamSession, const msg::Ba
         timeMsg->deserialize(baseMessage, buffer);
         timeMsg->refersTo = timeMsg->id;
         timeMsg->latency = timeMsg->received - timeMsg->sent;
-        //		LOG(INFO) << "Latency sec: " << timeMsg.latency.sec << ", usec: " << timeMsg.latency.usec << ", refers to: " << timeMsg.refersTo <<
-        //"\n";
-        streamSession->sendAsync(timeMsg, true);
+        // LOG(INFO) << "Latency sec: " << timeMsg.latency.sec << ", usec: " << timeMsg.latency.usec << ", refers to: " << timeMsg.refersTo << "\n";
+        streamSession->sendAsync(timeMsg);
 
         // refresh streamSession state
         ClientInfoPtr client = Config::instance().getClientInfo(streamSession->clientId);
diff --git a/server/stream_session.cpp b/server/stream_session.cpp
index f63be2c1..3e9f1e99 100644
--- a/server/stream_session.cpp
+++ b/server/stream_session.cpp
@@ -166,8 +166,8 @@ void StreamSession::sendAsync(msg::message_ptr message, bool send_now)
     if (!message)
         return;
 
-    // sendAsync(shared_const_buffer(*message), send_now);
     tv t;
+    // TODO: better set the timestamp in send_next for more accurate time sync
     message->sent = t;
     std::ostringstream oss;
     message->serialize(oss);