diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
index e5b7d8ccd..d8f5971b3 100644
--- a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
+++ b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
@@ -30,7 +30,7 @@ exports[`Matches shallow shapshot 1`] = `
             "id": "test-challenge",
           }
         }
-        hasPendingWorkflowRuns={null}
+        isWorkflowRunComplete={true}
         onDelete={[Function]}
         onDownload={[Function]}
         onOpenDownloadArtifactsModal={[Function]}
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 56506e323..2c15defb4 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -42,7 +42,7 @@ export default function Submission(props) {
     onOpenRatingsListModal,
     status,
     allowDelete,
-    hasPendingWorkflowRuns,
+    isWorkflowRunComplete,
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
   const onDownloadSubmission = onDownload.bind(1, submissionObject.id);
@@ -71,8 +71,6 @@ export default function Submission(props) {
   && track === COMPETITION_TRACKS.DES
   && safeForDownloadCheck === true;
 
-  const showPendingTooltip = !allowDelete && hasPendingWorkflowRuns;
-
   return (
     <tr styleName="submission-row">
       <td styleName="id-col">
@@ -154,11 +152,12 @@ export default function Submission(props) {
            ><DownloadIcon /></button>
            */ }
           {showDeleteButton && (
-            !showPendingTooltip ? (
+            isWorkflowRunComplete ? (
               <button
                 styleName="delete-icon"
                 onClick={() => onDelete(submissionObject.id)}
                 type="button"
+                disabled={!allowDelete}
               >
                 <DeleteIcon />
               </button>
@@ -239,5 +238,5 @@ Submission.propTypes = {
   allowDelete: PT.bool.isRequired,
   onOpenDownloadArtifactsModal: PT.func,
   onOpenRatingsListModal: PT.func,
-  hasPendingWorkflowRuns: PT.bool.isRequired,
+  isWorkflowRunComplete: PT.bool.isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
index 19faec324..a9ca5652f 100644
--- a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
@@ -87,19 +87,15 @@ export default function SubmissionsTable(props) {
         ? submissionWorkflowRuns[subObject.id]
         : null;
 
-      let isWorkflowRunComplete = true; // allow delete if no runs
+      const hasRuns = workflowRunsForSubmission && workflowRunsForSubmission.length > 0;
 
-      if (workflowRunsForSubmission && workflowRunsForSubmission.length > 0) {
-        isWorkflowRunComplete = workflowRunsForSubmission.length === 0
-      || workflowRunsForSubmission.every(run => TERMINAL_STATUSES.includes(run.status));
-      }
+      const isWorkflowRunComplete = !hasRuns
+        ? true
+        : workflowRunsForSubmission.every(run => TERMINAL_STATUSES.includes(run.status));
 
       const allowDelete = submissionPhaseStartDate
-        && moment(subObject.submissionDate).isAfter(submissionPhaseStartDate)
-        && isWorkflowRunComplete;
+        && moment(subObject.submissionDate).isAfter(submissionPhaseStartDate);
 
-      const hasPendingWorkflowRuns = workflowRunsForSubmission
-        && workflowRunsForSubmission.some(run => !TERMINAL_STATUSES.includes(run.status));
 
       const submission = (
         <Submission
@@ -115,7 +111,7 @@ export default function SubmissionsTable(props) {
           allowDelete={allowDelete}
           onOpenDownloadArtifactsModal={onOpenDownloadArtifactsModal}
           onOpenRatingsListModal={onOpenRatingsListModal}
-          hasPendingWorkflowRuns={hasPendingWorkflowRuns}
+          isWorkflowRunComplete={isWorkflowRunComplete}
         />
       );
       submissionsWithDetails.push(submission);