diff --git a/opentrons-ai-client/src/molecules/ControlledLabwareListItems/index.tsx b/opentrons-ai-client/src/molecules/ControlledLabwareListItems/index.tsx
index 5f967bb950e..2c3e10d2b24 100644
--- a/opentrons-ai-client/src/molecules/ControlledLabwareListItems/index.tsx
+++ b/opentrons-ai-client/src/molecules/ControlledLabwareListItems/index.tsx
@@ -36,7 +36,7 @@ export function ControlledLabwareListItems(): JSX.Element | null {
       render={({ field }) => {
         return (
           <>
-            {labwares.map(labware => {
+            {labwares.map((labware, index) => {
               const labwareDef = defs[labware.labwareURI]
               const dropdownProps = {
                 currentOption: {
@@ -63,7 +63,7 @@ export function ControlledLabwareListItems(): JSX.Element | null {
               return (
                 <ListItem
                   type="noActive"
-                  key={`${labwareDef.parameters.loadName}`}
+                  key={`${index}_${labwareDef.parameters.loadName}`}
                 >
                   <ListItemCustomize
                     dropdown={dropdownProps}
diff --git a/opentrons-ai-client/src/molecules/LabwareDiagram/index.tsx b/opentrons-ai-client/src/molecules/LabwareDiagram/index.tsx
index 5583d5347b1..e914b641738 100644
--- a/opentrons-ai-client/src/molecules/LabwareDiagram/index.tsx
+++ b/opentrons-ai-client/src/molecules/LabwareDiagram/index.tsx
@@ -8,7 +8,7 @@ export function LabwareDiagram({
 }: {
   def: LabwareDefinition2
 }): JSX.Element | undefined {
-  const labwareSrc: string = labwareImages[def.parameters.loadName][0] ?? ''
+  const labwareSrc: string = labwareImages[def.parameters.loadName]?.[0] ?? ''
 
   if (labwareSrc === '') {
     return