diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
index f86a7f416..48f82ddd1 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx
@@ -335,7 +335,7 @@ const AddBucket = ({
                       "Allows to keep multiple versions of the same object under the same key."
                     }
                     label={"Versioning"}
-                    disabled={!distributedSetup}
+                    disabled={!distributedSetup || lockingEnabled}
                   />
                 </Grid>
                 <Grid item xs={12}>
@@ -347,6 +347,9 @@ const AddBucket = ({
                     checked={lockingEnabled}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                       enableObjectLocking(event.target.checked);
+                      if (event.target.checked) {
+                        addBucketVersioned(true);
+                      }
                     }}
                     label={"Object Locking"}
                     description={