diff --git a/src/Components/CreateImageWizard/utilities/requestMapper.ts b/src/Components/CreateImageWizard/utilities/requestMapper.ts
index c9d994eb..9474a712 100644
--- a/src/Components/CreateImageWizard/utilities/requestMapper.ts
+++ b/src/Components/CreateImageWizard/utilities/requestMapper.ts
@@ -497,7 +497,8 @@ const getServices = (state: RootState): Services | undefined => {
   if (
     services.enabled.length === 0 &&
     services.masked.length === 0 &&
-    services.disabled.length === 0
+    services.disabled.length === 0 &&
+    !selectFirstBootScript(state)
   ) {
     return undefined;
   }