diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 10376c888..2df4c9576 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -258,7 +258,8 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
 {
 	Dictionary::Ptr message = JsonRpc::DecodeMessage(jsonString);
 
-	Log(LogCritical, "MESSAGE-HANDLER")
+	if (m_Endpoint)
+		Log(LogCritical, "MESSAGE-HANDLER")
 			<< "Got message from endpoint '" << m_Endpoint->GetName() << "': " << jsonString;
 
 	if (m_Endpoint && message->Contains("ts")) {