diff --git a/base-foc/src/core/signal_source_component.cc b/base-foc/src/core/signal_source_component.cc
index d859db836..d96daecef 100644
--- a/base-foc/src/core/signal_source_component.cc
+++ b/base-foc/src/core/signal_source_component.cc
@@ -32,6 +32,12 @@ using namespace Genode;
  ** Signal-source component **
  *****************************/
 
+void Signal_source_component::release(Signal_context_component *context)
+{
+	if (context && context->is_enqueued())
+		_signal_queue.remove(context);
+}
+
 void Signal_source_component::submit(Signal_context_component *context,
                                      Ipc_ostream              *ostream,
                                      int                       cnt)
diff --git a/base-nova/src/core/signal_source_component.cc b/base-nova/src/core/signal_source_component.cc
index 097720f49..4ad9e1f71 100644
--- a/base-nova/src/core/signal_source_component.cc
+++ b/base-nova/src/core/signal_source_component.cc
@@ -30,6 +30,12 @@ using namespace Genode;
  ** Signal-source component **
  *****************************/
 
+void Signal_source_component::release(Signal_context_component *context)
+{
+	if (context && context->is_enqueued())
+		_signal_queue.remove(context);
+}
+
 void Signal_source_component::submit(Signal_context_component *context,
                                      Ipc_ostream              *ostream,
                                      int                       cnt)
@@ -41,8 +47,7 @@ void Signal_source_component::submit(Signal_context_component *context,
 		_signal_queue.enqueue(context);
 
 		/* wake up client */
-		Nova::sm_ctrl(_blocking_semaphore.local_name(),
-		              Nova::SEMAPHORE_UP);
+		Nova::sm_ctrl(_blocking_semaphore.local_name(), Nova::SEMAPHORE_UP);
 	}
 }
 
@@ -67,8 +72,7 @@ Signal_source_component::Signal_source_component(Rpc_entrypoint *ep)
 {
 	/* initialized blocking semaphore */
 	addr_t sem_sel = cap_selector_allocator()->alloc();
-	uint8_t ret = Nova::create_sm(sem_sel,
-	                              Platform_pd::pd_core_sel(), 0);
+	uint8_t ret = Nova::create_sm(sem_sel, Platform_pd::pd_core_sel(), 0);
 	if (ret)
 		PERR("create_sm returned %u", ret);
 
diff --git a/base/src/core/include/signal_session_component.h b/base/src/core/include/signal_session_component.h
index 779afee4c..8a5314e51 100644
--- a/base/src/core/include/signal_session_component.h
+++ b/base/src/core/include/signal_session_component.h
@@ -48,6 +48,11 @@ namespace Genode {
 			Signal_context_component(long imprint, Signal_source_component *source)
 			: _imprint(imprint), _cnt(0), _source(source) { }
 
+			/**
+			 * De-constructor
+			 */
+			~Signal_context_component(); 
+
 			/**
 			 * Increment number of signals to be delivered at once
 			 */
@@ -79,6 +84,8 @@ namespace Genode {
 			 */
 			Signal_source_component(Rpc_entrypoint *rpc_entrypoint);
 
+			void release(Signal_context_component *context);
+
 			void submit(Signal_context_component *context,
 			            Ipc_ostream              *ostream,
 			            int                       cnt);
diff --git a/base/src/core/signal_session_component.cc b/base/src/core/signal_session_component.cc
index e4e127aa7..d3ad0a3b6 100644
--- a/base/src/core/signal_session_component.cc
+++ b/base/src/core/signal_session_component.cc
@@ -40,12 +40,13 @@ Signal_session_component::Signal_session_component(Rpc_entrypoint *source_ep,
 
 Signal_session_component::~Signal_session_component()
 {
+	/* remove _signal_source from entrypoint */
+	_source_ep->dissolve(&_source);
+
 	/* free all signal contexts */
 	while (Signal_context_component *r = _contexts_slab.first_object())
 		free_context(r->cap());
 
-	/* remove _signal_source from entrypoint */
-	_source_ep->dissolve(&_source);
 }
 
 
@@ -99,3 +100,8 @@ void Signal_session_component::submit(Signal_context_capability context_cap,
 
 	context->source()->submit(context, _ipc_ostream, cnt);
 }
+
+Signal_context_component::~Signal_context_component() {
+	if (is_enqueued() && _source)
+		_source->release(this);
+}
diff --git a/base/src/core/signal_source_component.cc b/base/src/core/signal_source_component.cc
index 4e795f8fc..c8ee1e0a6 100644
--- a/base/src/core/signal_source_component.cc
+++ b/base/src/core/signal_source_component.cc
@@ -25,6 +25,12 @@ using namespace Genode;
  ** Signal-source component **
  *****************************/
 
+void Signal_source_component::release(Signal_context_component *context)
+{
+	if (context && context->is_enqueued())
+		_signal_queue.remove(context);
+}
+
 void Signal_source_component::submit(Signal_context_component *context,
                                      Ipc_ostream              *ostream,
                                      int                       cnt)