diff --git a/repos/base/include/base/entrypoint.h b/repos/base/include/base/entrypoint.h
index 4b4e351bcf..6bb3578575 100644
--- a/repos/base/include/base/entrypoint.h
+++ b/repos/base/include/base/entrypoint.h
@@ -131,6 +131,11 @@ class Genode::Entrypoint : Genode::Noncopyable
 
 		Entrypoint(Env &env, size_t stack_size, char const *name);
 
+		~Entrypoint()
+		{
+			_rpc_ep->dissolve(&_signal_proxy);
+		}
+
 		/**
 		 * Associate RPC object with the entry point
 		 */