diff --git a/ui/src/components/CheckboxTree/CheckboxTree.tsx b/ui/src/components/CheckboxTree/CheckboxTree.tsx
index a84d85868..cb7c378f1 100644
--- a/ui/src/components/CheckboxTree/CheckboxTree.tsx
+++ b/ui/src/components/CheckboxTree/CheckboxTree.tsx
@@ -67,6 +67,12 @@ function CheckboxTree(props: CheckboxTreeProps) {
             setValues((prevValues) => {
                 const updatedValues = new Map(prevValues);
                 group.fields.forEach((item) => {
+                    const findFieldInRow = controlOptions?.rows?.find(
+                        (rowItem) => rowItem.field === item
+                    );
+                    if (findFieldInRow?.checkbox?.disabled === true) {
+                        return;
+                    }
                     updatedValues.set(item, { checkbox: newCheckboxValue });
                 });
                 handleChange(field, packValue(updatedValues), 'checkboxTree');
diff --git a/ui/src/components/CheckboxTree/StyledComponent.tsx b/ui/src/components/CheckboxTree/StyledComponent.tsx
index 35abe193e..3734d9fc6 100644
--- a/ui/src/components/CheckboxTree/StyledComponent.tsx
+++ b/ui/src/components/CheckboxTree/StyledComponent.tsx
@@ -35,7 +35,6 @@ export const StyledCollapsiblePanel = styled(CollapsiblePanel)`
         })};
         display: flex;
         align-items: center;
-        align-content: center;
         // for prisma styling
         & > span {
             align-content: center;
@@ -118,7 +117,6 @@ export const CustomCheckbox = styled.input.attrs({ type: 'checkbox' })`
             enterprise: variables.backgroundColor,
             prisma: variables.focusColor,
         })};
-        border: none;
     }
 
     &:checked::after {