diff --git a/lib/remote/eventqueue.cpp b/lib/remote/eventqueue.cpp
index d79b61589..7b960daa4 100644
--- a/lib/remote/eventqueue.cpp
+++ b/lib/remote/eventqueue.cpp
@@ -71,14 +71,6 @@ void EventQueue::RemoveClient(void *client)
 	m_Events.erase(client);
 }
 
-void EventQueue::UnregisterIfUnused(const String& name, const EventQueue::Ptr& queue)
-{
-	std::unique_lock<std::mutex> lock(queue->m_Mutex);
-
-	if (queue->m_Events.empty())
-		Unregister(name);
-}
-
 void EventQueue::SetTypes(const std::set<String>& types)
 {
 	std::unique_lock<std::mutex> lock(m_Mutex);
diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp
index 32bd34a7a..986ad5844 100644
--- a/lib/remote/eventqueue.hpp
+++ b/lib/remote/eventqueue.hpp
@@ -38,7 +38,6 @@ public:
 	Dictionary::Ptr WaitForEvent(void *client, double timeout = 5);
 
 	static std::vector<EventQueue::Ptr> GetQueuesForType(const String& type);
-	static void UnregisterIfUnused(const String& name, const EventQueue::Ptr& queue);
 
 	static EventQueue::Ptr GetByName(const String& name);
 	static void Register(const String& name, const EventQueue::Ptr& function);