diff --git a/app/src/organisms/DropTipWizard/getAddressableAreaFromConfig.ts b/app/src/organisms/DropTipWizard/getAddressableAreaFromConfig.ts
index 021b84ccc09..7f9ccda9c52 100644
--- a/app/src/organisms/DropTipWizard/getAddressableAreaFromConfig.ts
+++ b/app/src/organisms/DropTipWizard/getAddressableAreaFromConfig.ts
@@ -1,5 +1,6 @@
 import {
   EIGHT_CHANNEL_WASTE_CHUTE_ADDRESSABLE_AREA,
+  FLEX_MODULE_ADDRESSABLE_AREAS,
   getCutoutIdForAddressableArea,
   getDeckDefFromRobotType,
   MOVABLE_TRASH_ADDRESSABLE_AREAS,
@@ -46,9 +47,11 @@ export function getAddressableAreaFromConfig(
   if (providedAddressableAreas.includes(addressableArea)) {
     addressableAreaFromConfig = addressableArea
   } else if (
-    // if no, check if provides a movable trash
-    providedAddressableAreas.some(aa =>
-      MOVABLE_TRASH_ADDRESSABLE_AREAS.includes(aa)
+    // if no, check if provides a movable trash or module fixture
+    providedAddressableAreas.some(
+      aa =>
+        MOVABLE_TRASH_ADDRESSABLE_AREAS.includes(aa) ||
+        FLEX_MODULE_ADDRESSABLE_AREAS.includes(aa)
     )
   ) {
     addressableAreaFromConfig = providedAddressableAreas[0]
diff --git a/components/src/hardware-sim/BaseDeck/BaseDeck.tsx b/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
index d896c0c9370..db72c865cd3 100644
--- a/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
+++ b/components/src/hardware-sim/BaseDeck/BaseDeck.tsx
@@ -16,6 +16,7 @@ import {
   WASTE_CHUTE_STAGING_AREA_FIXTURES,
   HEATERSHAKER_MODULE_V1,
   MODULE_FIXTURES_BY_MODEL,
+  STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE,
 } from '@opentrons/shared-data'
 
 import { RobotCoordinateSpace } from '../RobotCoordinateSpace'
@@ -114,7 +115,9 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
   )
   const stagingAreaFixtures = deckConfig.filter(
     fixture =>
-      fixture.cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE &&
+      (fixture.cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE ||
+        fixture.cutoutFixtureId ===
+          STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE) &&
       STAGING_AREA_CUTOUTS.includes(fixture.cutoutId)
   )
   const trashBinFixtures = deckConfig.filter(