diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
index c6e462e7..6e8331fd 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
@@ -269,7 +269,7 @@ export const WorkflowConfig = {
 					props: {
 						submission: submission,
 						stageId: pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
-						reviewRoundId: selectedReviewRound.id,
+						reviewRoundId: selectedReviewRound?.id,
 					},
 				});
 			}
@@ -298,7 +298,11 @@ export const WorkflowConfig = {
 			);
 
 			// if review stage has not started show no items
-			if (selectedReviewRound.round < currentReviewRound.round) {
+			if (
+				!selectedReviewRound ||
+				!currentReviewRound ||
+				selectedReviewRound.round < currentReviewRound.round
+			) {
 				return [];
 			}
 
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
index 185ea4d7..d47d9826 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
@@ -194,7 +194,7 @@ export const WorkflowConfig = {
 					props: {
 						submission: submission,
 						stageId: pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW,
-						reviewRoundId: selectedReviewRound.id,
+						reviewRoundId: selectedReviewRound?.id,
 					},
 				});
 			}
@@ -218,7 +218,11 @@ export const WorkflowConfig = {
 			);
 
 			// if review stage has not started show no items
-			if (selectedReviewRound.round < currentReviewRound.round) {
+			if (
+				!selectedReviewRound ||
+				!currentReviewRound ||
+				selectedReviewRound.round < currentReviewRound.round
+			) {
 				return [];
 			}