diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts b/app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts
index c74840ca5b0..c4b4d92a31b 100644
--- a/app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts
+++ b/app/src/organisms/ErrorRecoveryFlows/hooks/useFailedLabwareUtils.ts
@@ -287,7 +287,7 @@ export function getFailedCmdRelevantLabware(
   const failedLWURI = runRecord?.data.labware.find(
     labware => labware.id === recentRelevantFailedLabwareCmd?.params.labwareId
   )?.definitionUri
-  if (failedLWURI != null) {
+  if (failedLWURI != null && Object.keys(lwDefsByURI).includes(failedLWURI)) {
     return {
       name: getLabwareDisplayName(lwDefsByURI[failedLWURI]),
       nickname: labwareNickname,
diff --git a/shared-data/js/helpers/getLoadedLabwareDefinitionsByUri.ts b/shared-data/js/helpers/getLoadedLabwareDefinitionsByUri.ts
index 120dc760d13..4892569a318 100644
--- a/shared-data/js/helpers/getLoadedLabwareDefinitionsByUri.ts
+++ b/shared-data/js/helpers/getLoadedLabwareDefinitionsByUri.ts
@@ -9,7 +9,11 @@ export function getLoadedLabwareDefinitionsByUri(
   commands: RunTimeCommand[]
 ): LabwareDefinitionsByUri {
   return commands.reduce((acc, command) => {
-    if (command.commandType === 'loadLabware') {
+    if (
+      command.commandType === 'loadLabware' ||
+      command.commandType === 'loadLid' ||
+      command.commandType === 'loadLidStack'
+    ) {
       const labwareDef: LabwareDefinition2 | undefined =
         command.result?.definition
       if (labwareDef == null) {