diff --git a/src/components/modals/ManagePlanSchedulingGoalsModal.svelte b/src/components/modals/ManagePlanSchedulingGoalsModal.svelte
index 139ff7d9a4..0602086be1 100644
--- a/src/components/modals/ManagePlanSchedulingGoalsModal.svelte
+++ b/src/components/modals/ManagePlanSchedulingGoalsModal.svelte
@@ -202,7 +202,7 @@
     }
   }
 
-  async function onUpdateGoal(selectedGoals: Record<number, boolean>) {
+  async function onUpdateGoals(selectedGoals: Record<number, boolean>) {
     if ($plan && $schedulingPlanSpecification) {
       const goalPlanSpecUpdates: {
         goalPlanSpecIdsToDelete: number[];
@@ -220,10 +220,12 @@
 
           // if we find at least one goal invocation with the selected goal_id, we don't want to insert this goal_id into the plan spec
           // i.e. this goal was already selected when we entered the modal, so we don't want to kick off an update, which would cause a duplicate invocation to appear
-          const goalAlreadyExistsInPlanSpec = $allowedSchedulingGoalSpecs.find(e => e.goal_id === goalId) !== undefined;
+          const goalsInPlanSpecification = $allowedSchedulingGoalSpecs.filter(
+            schedulingGoalPlanSpecification => schedulingGoalPlanSpecification.goal_id === goalId,
+          );
 
           if (isSelected && $schedulingPlanSpecification !== null) {
-            if (!goalAlreadyExistsInPlanSpec) {
+            if (!goalsInPlanSpecification.length) {
               return {
                 ...prevGoalPlanSpecUpdates,
                 goalPlanSpecsToAdd: [
@@ -241,7 +243,10 @@
           } else {
             return {
               ...prevGoalPlanSpecUpdates,
-              goalPlanSpecIdsToDelete: [...prevGoalPlanSpecUpdates.goalPlanSpecIdsToDelete, goalId],
+              goalPlanSpecIdsToDelete: [
+                ...prevGoalPlanSpecUpdates.goalPlanSpecIdsToDelete,
+                ...goalsInPlanSpecification.map(({ goal_invocation_id }) => goal_invocation_id),
+              ],
             };
           }
         },
@@ -296,7 +301,7 @@
     <button class="st-button secondary" on:click={() => dispatch('close')}> Cancel </button>
     <button
       class="st-button"
-      on:click={() => onUpdateGoal(selectedGoals)}
+      on:click={() => onUpdateGoals(selectedGoals)}
       use:permissionHandler={{
         hasPermission: hasEditSpecPermission && !$planReadOnly,
         permissionError: $planReadOnly
diff --git a/src/types/scheduling.ts b/src/types/scheduling.ts
index fbf883cf16..99620f1c5c 100644
--- a/src/types/scheduling.ts
+++ b/src/types/scheduling.ts
@@ -185,7 +185,7 @@ export type SchedulingGoalPlanSpecification = {
   enabled: boolean;
   goal_definition?: Pick<SchedulingGoalDefinition, 'analyses'> | null;
   goal_id: number;
-  goal_invocation_id?: number;
+  goal_invocation_id: number;
   goal_metadata:
     | (Pick<SchedulingGoalMetadata, 'name' | 'owner' | 'public'> & {
         versions: Pick<SchedulingGoalDefinition, 'revision' | 'analyses' | 'type' | 'parameter_schema'>[];
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index e96e8b6abd..4e4e8c063d 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -3815,7 +3815,7 @@ const gql = {
       }
       deleteSchedulingGoalModelSpecifications: ${Queries.DELETE_SCHEDULING_GOAL_MODEL_SPECIFICATIONS}(
         where: {
-          goal_id: { _in: $goalIdsToDelete },
+          goal_invocation_id: { _in: $goalIdsToDelete },
           _and: {
             model_id: { _eq: $modelId }
           }
@@ -3855,7 +3855,7 @@ const gql = {
         }
       }
       deleteSchedulingGoalPlanSpecifications: ${Queries.DELETE_SCHEDULING_SPECIFICATION_GOALS}(
-        where: { goal_id: { _in: $goalSpecIdsToDelete } }
+        where: { goal_invocation_id: { _in: $goalSpecIdsToDelete } }
       ) {
         affected_rows
       }