diff --git a/assets/js/src/form_editor/blocks/blocks.jsx b/assets/js/src/form_editor/blocks/blocks.jsx
index 41aff2a56f..54c36e43e8 100644
--- a/assets/js/src/form_editor/blocks/blocks.jsx
+++ b/assets/js/src/form_editor/blocks/blocks.jsx
@@ -15,7 +15,6 @@ import * as customText from './custom_text/custom_text.jsx';
 import * as customTextArea from './custom_textarea/custom_textarea.jsx';
 
 const registerCustomFieldBlock = (customField) => {
-  console.log('custom Field', customField);// TODO temporary, remove when all custom fields are implemented
   const namesMap = {
     text: {
       name: customText.name,
@@ -27,7 +26,6 @@ const registerCustomFieldBlock = (customField) => {
     },
   };
 
-  if (!namesMap[customField.type]) return;// TODO temporary, remove when all custom fields are implemented
   registerBlockType(
     formatCustomFieldBlockName(namesMap[customField.type].name, customField),
     namesMap[customField.type].settings
diff --git a/assets/js/src/form_editor/store/form_body_to_blocks.jsx b/assets/js/src/form_editor/store/form_body_to_blocks.jsx
index 21e82fa838..7e09904ca8 100644
--- a/assets/js/src/form_editor/store/form_body_to_blocks.jsx
+++ b/assets/js/src/form_editor/store/form_body_to_blocks.jsx
@@ -9,8 +9,6 @@ const mapCustomField = (item, customFields, mappedCommonProperties) => {
     textarea: 'mailpoet-form/custom-textarea',
   };
 
-  if (!namesMap[customField.type]) return null;// TODO temporary, remove when all custom fields are implemented
-
   const mapped = {
     ...mappedCommonProperties,
     name: formatCustomFieldBlockName(namesMap[customField.type], customField),