diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index c0c6590d6..cf33aec4a 100644
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -257,7 +257,7 @@ Value RequestCertificateHandler(const MessageOrigin& origin, const Dictionary::P
 
 void ApiClient::TimeoutTimerHandler(void)
 {
-	if (m_Seen < Utility::GetTime() - 60 && !m_Endpoint->GetSyncing()) {
+	if (m_Seen < Utility::GetTime() - 60 && (!m_Endpoint || !m_Endpoint->GetSyncing())) {
 		/* Obtain a strong reference to ourselves because Disconnect otherwise removes the last reference */
 		ApiClient::Ptr self = this;