diff --git a/packages/core/core-flows/src/defaults/steps/create-default-store.ts b/packages/core/core-flows/src/defaults/steps/create-default-store.ts
index 301933c928..901d31ce6d 100644
--- a/packages/core/core-flows/src/defaults/steps/create-default-store.ts
+++ b/packages/core/core-flows/src/defaults/steps/create-default-store.ts
@@ -13,6 +13,10 @@ export const createDefaultStoreStep = createStep(
   async (data: CreateDefaultStoreStepInput, { container }) => {
     const storeService = container.resolve(ModuleRegistrationName.STORE)
 
+    if (!storeService) {
+      return new StepResponse(void 0)
+    }
+
     let shouldDelete = false
     let [store] = await storeService.listStores({}, { take: 1 })
 
diff --git a/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts b/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts
index 8a40f2cd5b..4de9a64657 100644
--- a/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts
+++ b/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts
@@ -17,6 +17,10 @@ export const createDefaultSalesChannelStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
+    if (!salesChannelService) {
+      return new StepResponse(void 0)
+    }
+
     let shouldDelete = false
     let [salesChannel] = await salesChannelService.listSalesChannels(
       {},