diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
index 31abc8121c..ab129cd686 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
@@ -240,7 +240,7 @@ function setAttributeFormData(hash) {
   const type = formType === 'number' ? 'integer' : formType;
   let defaultValue = type === 'number' ? 0 : '';
 
-  if (type === 'checkbox') {
+  if (type === 'boolean') {
     defaultValue = false;
   }
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/sagas.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/sagas.js
index 8e6e2a9d62..6593e47ed0 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/sagas.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/sagas.js
@@ -57,7 +57,6 @@ export function* submitChanges(action) {
   try {
     // Show button loader
     yield put(setButtonLoader());
-
     const modelName = get(storeData.getContentType(), 'name');
     const data = yield select(makeSelectModel());
     const body = cloneDeep(data);
@@ -83,7 +82,7 @@ export function* submitChanges(action) {
           set(body.attributes[index].params, 'plugin', true);
         }
 
-        if (!value && key !== 'multiple') {
+        if (!value && key !== 'multiple' && key !== 'default') {
           const paramsKey = includes(key, 'Value') ? replace(key,'Value', '') : key;
           unset(body.attributes[index].params, paramsKey);
         }
@@ -99,7 +98,6 @@ export function* submitChanges(action) {
     const baseUrl = '/content-type-builder/models/';
     const requestUrl = method === 'POST' ? baseUrl : `${baseUrl}${body.name}`;
     const opts = { method, body };
-
     const response = yield call(request, requestUrl, opts, true);
 
     if (response.ok) {