diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index cf7ada7241bb4906b3bacca806947a5ce986768b..143fbdb4da42e97aaee2fc7e9f49b80199660060 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -183,15 +183,23 @@ const parseInvitedHE = (handlingEditor, state, collectionId) =>
       ? 'Invited'
       : handlingEditor.name,
   }
+
 const hideCustomIdStatuses = ['draft', 'technicalChecks']
-export const newestFirstParseDashboard = (state, items) =>
-  chain(items)
+
+export const parseCollectionDetails = (state, collection) => ({
+  ...collection,
+  customId:
+    !hideCustomIdStatuses.includes(get(collection, 'status', 'draft')) &&
+    collection.customId,
+  handlingEditor: parseInvitedHE(
+    collection.handlingEditor,
+    state,
+    collection.id,
+  ),
+})
+
+export const newestFirstParseDashboard = (state = {}) =>
+  chain(state.collections)
     .orderBy(['created'], ['desc'])
-    .map(item => ({
-      ...item,
-      customId:
-        !hideCustomIdStatuses.includes(get(item, 'status', 'draft')) &&
-        item.customId,
-      handlingEditor: parseInvitedHE(item.handlingEditor, state, item.id),
-    }))
+    .map(item => parseCollectionDetails(state, item))
     .value()
diff --git a/packages/component-faraday-ui/src/ManuscriptCard.js b/packages/component-faraday-ui/src/ManuscriptCard.js
index 269c0401842819645308600decec57ae403e711b..e9f0e796f79d1b5319c9a2a8faaccb6006619a58 100644
--- a/packages/component-faraday-ui/src/ManuscriptCard.js
+++ b/packages/component-faraday-ui/src/ManuscriptCard.js
@@ -26,7 +26,7 @@ const ManuscriptCard = ({
   onCardClick,
   fragment = {},
   manuscriptType = {},
-  collection: { visibleStatus = 'Draft', handlingEditor, customId },
+  collection: { visibleStatus = 'Draft', handlingEditor, customId, id: collId },
 }) => {
   const {
     authors = [],
@@ -82,7 +82,7 @@ const ManuscriptCard = ({
             <Item justify="flex-end" onClick={e => e.stopPropagation()}>
               <OpenModal
                 confirmText="Delete"
-                modalKey={`delete-${customId}`}
+                modalKey={`delete-${collId}`}
                 onConfirm={onDelete}
                 title="Are you sure you want to delete this submission?"
               >
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
index a4d5c432c355631b1c842b6e681dd19a0359e2ea..cc79766601a6e3bf1461efb6c0c1eaa294624d95 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
@@ -40,7 +40,7 @@ const ManuscriptHeader = ({
         </Row>
       )}
       <Row alignItems="center" justify="flex-start" mb={1}>
-        <Text customId mr={1}>{`ID ${customId}`}</Text>
+        {customId && <Text customId mr={1}>{`ID ${customId}`}</Text>}
         {submitted && (
           <DateParser durationThreshold={0} timestamp={submitted}>
             {timestamp => <Text mr={3}>Submitted on {timestamp}</Text>}
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index e8e823d05312bc3533bbd90a7b372c11126589aa..c1abbef8a90f4a0203bfc5d4afc5da1021f09d46 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -37,6 +37,7 @@ import {
   pendingHEInvitation,
   currentUserIsReviewer,
   canMakeRecommendation,
+  parseCollectionDetails,
   canOverrideTechnicalChecks,
 } from 'pubsweet-component-faraday-selectors'
 import { RemoteOpener } from 'pubsweet-component-faraday-ui'
@@ -72,7 +73,10 @@ export default compose(
       handlingEditors: selectHandlingEditors(state),
       hasManuscriptFailure: hasManuscriptFailure(state),
       fragment: selectFragment(state, match.params.version),
-      collection: selectCollection(state, match.params.project),
+      collection: parseCollectionDetails(
+        state,
+        selectCollection(state, match.params.project),
+      ),
       pendingHEInvitation: pendingHEInvitation(state, match.params.project),
       editorialRecommendations: selectEditorialRecommendations(
         state,
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardPage.js b/packages/components-faraday/src/components/Dashboard/DashboardPage.js
index 646720b8ab16883694bfd66caae03cf779b786ba..eda5819b44ca04a7b91afc876a6cec42bba2569c 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardPage.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardPage.js
@@ -21,7 +21,7 @@ export default compose(
     state => {
       const { collections, conversion } = state
       const currentUser = selectCurrentUser(state)
-      const dashboard = newestFirstParseDashboard(state, collections)
+      const dashboard = newestFirstParseDashboard(state)
 
       const userPermissions = getUserPermissions(state)
       return {