diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js
index 90b8af793..888a05157 100644
--- a/client/src/containers/Items/ItemForm.js
+++ b/client/src/containers/Items/ItemForm.js
@@ -232,7 +232,7 @@ function ItemForm({
         {({ isSubmitting, handleSubmit }) => (
           <Form>
             <div class={classNames(CLASSES.PAGE_FORM_BODY)}>
-              <ItemFormPrimarySection itemId={itemId} />
+              <ItemFormPrimarySection itemType={itemDetail?.type}/>
               <ItemFormBody />
               <ItemFormInventorySection />
             </div>
diff --git a/client/src/containers/Items/ItemFormPrimarySection.js b/client/src/containers/Items/ItemFormPrimarySection.js
index ab318e55f..d35bcc4fc 100644
--- a/client/src/containers/Items/ItemFormPrimarySection.js
+++ b/client/src/containers/Items/ItemFormPrimarySection.js
@@ -38,10 +38,8 @@ function ItemFormPrimarySection({
   changePageSubtitle,
 
   // #ownProps
-  itemId,
+  itemType,
 }) {
-  const { formatMessage } = useIntl();
-  const isNewMode = !itemId;
 
   const itemTypeHintContent = (
     <>
@@ -91,7 +89,7 @@ function ItemFormPrimarySection({
                 changePageSubtitle(transitionItemTypeKeyToLabel(_value));
               })}
               selectedValue={value}
-              disabled={value === 'inventory' && !isNewMode}
+              disabled={itemType === 'inventory'}
             >
               <Radio label={<T id={'service'} />} value="service" />
               <Radio label={<T id={'non_inventory'} />} value="non-inventory" />
@@ -142,10 +140,7 @@ function ItemFormPrimarySection({
                 inline={true}
                 intent={inputIntent({ error, touched })}
                 helperText={<ErrorMessage name="category_id" />}
-                className={classNames(
-                  'form-group--category',
-                  Classes.FILL,
-                )}
+                className={classNames('form-group--category', Classes.FILL)}
               >
                 <CategoriesSelectList
                   categoriesList={categoriesList}