diff --git a/kernel/arch/armv8/paging.c b/kernel/arch/armv8/paging.c
index 7d77df9..d348c98 100644
--- a/kernel/arch/armv8/paging.c
+++ b/kernel/arch/armv8/paging.c
@@ -627,6 +627,10 @@ errval_t caps_copy_to_vnode(struct cte *dest_vnode_cte, cslot_t dest_slot,
         return err;
     }
 
+    // NOTE rueegges: The capability owner for page table mappings is never set so we do it here
+    //                otherwise unmap does not work on cores with id > 0
+    mapping_cte->mdbnode.owner = my_core_id;
+
     /* insert mapping cap into mdb */
     err = mdb_insert(mapping_cte);
     if (err_is_fail(err)) {