diff --git a/repos/base-tukija/src/core/include/cell_component.h b/repos/base-tukija/src/core/include/cell_component.h
index e71e9782e9..2e9dda6436 100644
--- a/repos/base-tukija/src/core/include/cell_component.h
+++ b/repos/base-tukija/src/core/include/cell_component.h
@@ -84,6 +84,13 @@ class Ealan::Cell_component : public Genode::Rpc_object<Cell>,
 
             _calculate_mask_for_location(&_cip->cores_reserved, affinity.location());
             Genode::log("Cores for <", label, ">: ", _cip->cores_reserved);
+
+            _ep.manage(this);
+        }
+
+        ~Cell_component()
+        {
+            _ep.dissolve(this);
         }
 
         /********************