diff --git a/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx b/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx
index dce90069..2127c2cf 100644
--- a/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx
+++ b/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx
@@ -287,7 +287,7 @@ const PolicySelector = () => {
         } as React.CSSProperties
       }
     >
-      {policyTitle || 'Select a policy'}
+      {policyID === undefined ? 'None' : policyTitle || 'Select a policy'}
     </MenuToggle>
   );
 
diff --git a/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx b/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx
index 37e20c52..fdd50468 100644
--- a/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx
+++ b/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx
@@ -329,7 +329,7 @@ const ProfileSelector = () => {
     >
       <TextInputGroup isPlain>
         <TextInputGroupMain
-          value={profileID ? profileID : inputValue}
+          value={profileID ? profileID : inputValue || 'None'}
           onClick={onInputClick}
           onChange={onTextInputChange}
           autoComplete="off"