diff --git a/src/composables/useSubmission.js b/src/composables/useSubmission.js
index b1d1252d9..27886b5a7 100644
--- a/src/composables/useSubmission.js
+++ b/src/composables/useSubmission.js
@@ -234,8 +234,8 @@ export function useSubmission() {
 
 	function isDecisionAvailable(submission, decisionId) {
 		const stage = getActiveStage(submission);
-		return stage?.availableEditorialDecisions?.some(
-			(decision) => decision.id === decisionId,
+		return submission?.availableEditorialDecisions?.some(
+			(decision) => decision.id === decisionId && decision.stageId === stage.id,
 		);
 	}