diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp
index 674d413cd..fbf13c0d5 100644
--- a/lib/remoting/endpointmanager.cpp
+++ b/lib/remoting/endpointmanager.cpp
@@ -322,7 +322,8 @@ void EndpointManager::SubscriptionTimerHandler(void)
 		}
 	}
 
-	m_Endpoint->SetSubscriptions(subscriptions);
+	if (m_Endpoint)
+		m_Endpoint->SetSubscriptions(subscriptions);
 }
 
 void EndpointManager::ReconnectTimerHandler(void)