diff --git a/opentech/static_src/src/app/src/redux/actions/submissions.js b/opentech/static_src/src/app/src/redux/actions/submissions.js
index b1c4cabdc9aae805a9e1797a99f8de9769c0500b..f55cd9a3695939f466673c105d837124955d61e3 100644
--- a/opentech/static_src/src/app/src/redux/actions/submissions.js
+++ b/opentech/static_src/src/app/src/redux/actions/submissions.js
@@ -82,7 +82,7 @@ export const loadSubmissionFromURL = () => (dispatch, getState) => {
 export const setCurrentSubmission = id => (dispatch, getState) => {
     const submissionID = getCurrentSubmissionID(getState())
 
-    if (id && submissionID !== id) {
+    if (id !== null  && submissionID !== id) {
         dispatch(push(`?submission=${id}`));
     } else if (!id) {
         dispatch(push('?'));
@@ -129,7 +129,8 @@ export const loadCurrentRoundSubmissions = () => (dispatch, getState) => {
     return dispatch(fetchSubmissionsByRound(getCurrentRoundID(state))).then(() => {
         const state = getState()
         const ids = getCurrentRoundSubmissionIDs(state)
-        if (!ids.includes(getCurrentSubmissionID(state))) {
+        const currentSubmissionID = getCurrentSubmissionID(state)
+        if (currentSubmissionID !== null &&  !ids.includes(currentSubmissionID)) {
             dispatch(addMessage('The selected submission is not available in this view', MESSAGE_TYPES.WARNING))
             return dispatch(setCurrentSubmission(null))
         }
@@ -195,7 +196,8 @@ export const loadSubmissionsForCurrentStatus = () => (dispatch, getState) => {
     return dispatch(fetchSubmissionsByStatuses(getCurrentStatuses(state))).then(() => {
         const state = getState()
         const ids = getSubmissionIDsForCurrentStatuses(state)
-        if (!ids.includes(getCurrentSubmissionID(state))) {
+        const currentSubmissionID = getCurrentSubmissionID(state)
+        if (currentSubmissionID !== null &&  !ids.includes(currentSubmissionID)) {
             dispatch(addMessage('The selected submission is not available in this view', MESSAGE_TYPES.WARNING))
             return dispatch(setCurrentSubmission(null))
         }