diff --git a/src/components/pages/master-data/product/form/ProductForm.tsx b/src/components/pages/master-data/product/form/ProductForm.tsx
index 11e4b11f..01fa192c 100644
--- a/src/components/pages/master-data/product/form/ProductForm.tsx
+++ b/src/components/pages/master-data/product/form/ProductForm.tsx
@@ -491,7 +491,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                   formik.setFieldValue('sub_flags', []);
                 }}
                 options={productFlagMapping?.flags ?? []}
-                isLoading={isLoadingConstants}
+                isLoading={isLoadingConstants && !productFlagMapping}
                 isError={formik.touched.flag && Boolean(formik.errors.flag)}
                 errorMessage={formik.errors.flag as string}
                 isDisabled={type === 'detail'}
@@ -512,7 +512,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
                   );
                 }}
                 options={subFlagOptions}
-                isLoading={isLoadingConstants}
+                isLoading={isLoadingConstants && !productFlagMapping}
                 isError={
                   formik.touched.sub_flags && Boolean(formik.errors.sub_flags)
                 }