diff --git a/app/src/molecules/DeckThumbnail/index.tsx b/app/src/molecules/DeckThumbnail/index.tsx
index 8f58fa8b515..fed45696e55 100644
--- a/app/src/molecules/DeckThumbnail/index.tsx
+++ b/app/src/molecules/DeckThumbnail/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import map from 'lodash/map'
 
-import { BaseDeck, SlotLabels } from '@opentrons/components'
+import { BaseDeck } from '@opentrons/components'
 import {
   getDeckDefFromRobotType,
   getRobotTypeFromLoadedLabware,
@@ -121,9 +121,8 @@ export function DeckThumbnail(props: DeckThumbnailProps): JSX.Element | null {
       robotType={robotType}
       labwareLocations={labwareLocations}
       moduleLocations={moduleLocations}
+      showSlotLabels={showSlotLabels}
       {...styleProps}
-    >
-      {showSlotLabels ? <SlotLabels robotType={robotType} /> : null}
-    </BaseDeck>
+    ></BaseDeck>
   )
 }
diff --git a/components/src/hardware-sim/BaseDeck/BaseDeck.tsx b/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
index 9b866322a9c..1fe12ccdb91 100644
--- a/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
+++ b/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react'
-import isEmpty from 'lodash/isEmpty'
 
 import {
   RobotType,
@@ -65,6 +64,7 @@ interface BaseDeckProps {
   lightFill?: string
   darkFill?: string
   children?: React.ReactNode
+  showSlotLabels?: boolean
 }
 
 export function BaseDeck(props: BaseDeckProps): JSX.Element {
@@ -80,6 +80,7 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
     deckConfig = STANDARD_SLOT_DECK_CONFIG_FIXTURE,
     showExpansion = true,
     children,
+    showSlotLabels = false,
   } = props
   const deckDef = getDeckDefFromRobotType(robotType)
 
@@ -204,12 +205,11 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
               'slotName' in labwareLocation &&
               s.id === labwareLocation.slotName
           )
-          const labwareHasLiquid = !isEmpty(wellFill)
           return slotDef != null ? (
             <g
               key={slotDef.id}
               transform={`translate(${slotDef.position[0]},${slotDef.position[1]})`}
-              cursor={labwareHasLiquid ? 'pointer' : ''}
+              cursor={onLabwareClick != null ? 'pointer' : ''}
             >
               <LabwareRender
                 definition={definition}
@@ -221,7 +221,9 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
           ) : null
         }
       )}
-      <SlotLabels robotType={robotType} color={darkFill} />
+      {showSlotLabels ? (
+        <SlotLabels robotType={robotType} color={darkFill} />
+      ) : null}
       {children}
     </RobotCoordinateSpace>
   )