diff --git a/components/src/instrument/InstrumentInfo.tsx b/components/src/instrument/InstrumentInfo.tsx
index ff0d1dd23cc..435c22c0c5b 100644
--- a/components/src/instrument/InstrumentInfo.tsx
+++ b/components/src/instrument/InstrumentInfo.tsx
@@ -71,15 +71,19 @@ export function InstrumentInfo(props: InstrumentInfoProps): JSX.Element {
Tip rack
- {tiprackModels != null
- ? tiprackModels.map((model, index) => (
- -
-
- {model}
-
-
- ))
- : null}
+ {tiprackModels != null ? (
+ tiprackModels.map((model, index) => (
+ -
+
+ {model}
+
+
+ ))
+ ) : (
+
+ None
+
+ )}
diff --git a/components/src/instrument/__tests__/InstrumentInfo.test.tsx b/components/src/instrument/__tests__/InstrumentInfo.test.tsx
index dcd02e66545..bf92c48d4cb 100644
--- a/components/src/instrument/__tests__/InstrumentInfo.test.tsx
+++ b/components/src/instrument/__tests__/InstrumentInfo.test.tsx
@@ -45,4 +45,10 @@ describe('InstrumentInfo', () => {
screen.getByText('Tip rack')
screen.getByText('mock1')
})
+ it('renders none for pip and tiprack if none are selected', () => {
+ props.pipetteSpecs = undefined
+ props.tiprackModels = undefined
+ render(props)
+ screen.getByText('None')
+ })
})