diff --git a/lib/remoting/endpointmanager.cpp b/lib/remoting/endpointmanager.cpp
index 077b10643..883b260ff 100644
--- a/lib/remoting/endpointmanager.cpp
+++ b/lib/remoting/endpointmanager.cpp
@@ -331,7 +331,8 @@ void EndpointManager::SubscriptionTimerHandler(void)
 	BOOST_FOREACH(tie(tuples::ignore, object), DynamicType::GetByName("Endpoint")->GetObjects()) {
 		Endpoint::Ptr endpoint = dynamic_pointer_cast<Endpoint>(object);
 
-		if (!endpoint->IsLocalEndpoint())
+		/* don't copy subscriptions from non-local endpoints or the identity endpoint */
+		if (!endpoint->IsLocalEndpoint() || endpoint == m_Endpoint)
 			continue;
 
 		if (endpoint->GetSubscriptions()) {