diff --git a/ui/src/components/retro/EditActionItem.svelte b/ui/src/components/retro/EditActionItem.svelte
index 013cfa89..761f4de9 100644
--- a/ui/src/components/retro/EditActionItem.svelte
+++ b/ui/src/components/retro/EditActionItem.svelte
@@ -13,10 +13,10 @@
   export let handleDelete = () => {};
   export let handleAssigneeAdd = (retroId, actionId, userId) => {};
   export let handleAssigneeRemove = (retroId, actionId, userId) => () => {};
-  export let retroId = '';
   export let assignableUsers = [];
   export let action = {
     id: '',
+    retroId: '',
     content: '',
     completed: false,
     assignees: [],
@@ -26,6 +26,7 @@
 
   let editAction = {
     id: action.id,
+    retroId: action.retroId,
     content: action.content,
     completed: action.completed,
   };
@@ -36,7 +37,7 @@
     handleEdit(editAction);
   };
   const addAssignee = () => {
-    handleAssigneeAdd(retroId, action.id, selectedAssignee);
+    handleAssigneeAdd(action.retroId, action.id, selectedAssignee);
     selectedAssignee = '';
   };
 </script>
@@ -151,7 +152,7 @@
               <HollowButton
                 color="red"
                 onClick="{handleAssigneeRemove(
-                  retroId,
+                  action.retroId,
                   action.id,
                   assignee.id,
                 )}"
diff --git a/ui/src/pages/team/Team.svelte b/ui/src/pages/team/Team.svelte
index ad3bf113..4fdfb48e 100644
--- a/ui/src/pages/team/Team.svelte
+++ b/ui/src/pages/team/Team.svelte
@@ -384,11 +384,10 @@
 
   let showRetroActionEdit = false;
   let selectedAction = null;
-  let selectedActionRetroId = null;
   const toggleRetroActionEdit = (retroId, id) => () => {
     showRetroActionEdit = !showRetroActionEdit;
-    selectedAction = retroActions.find(r => r.id === id);
-    selectedActionRetroId = retroId;
+    selectedAction =
+      retroId !== null ? retroActions.find(r => r.id === id) : {};
   };
 
   function handleRetroActionEdit(action) {
@@ -871,7 +870,6 @@
       action="{selectedAction}"
       handleAssigneeAdd="{handleRetroActionAssigneeAdd}"
       handleAssigneeRemove="{handleRetroActionAssigneeRemove}"
-      retroId="{selectedActionRetroId}"
     />
   {/if}