diff --git a/src/DiffBuilderManager.php b/src/DiffBuilderManager.php
index a9b5c1d..8ccea9a 100644
--- a/src/DiffBuilderManager.php
+++ b/src/DiffBuilderManager.php
@@ -11,6 +11,7 @@ use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Plugin type manager for field diff builders.
@@ -19,6 +20,8 @@ use Drupal\Core\Plugin\DefaultPluginManager;
  */
 class DiffBuilderManager extends DefaultPluginManager {
 
+  use StringTranslationTrait;
+  
   /**
    * The entity type manager.
    *
@@ -182,8 +185,8 @@ class DiffBuilderManager extends DefaultPluginManager {
     $selected_plugin = $this->pluginsConfig->get('fields.' . $field_key);
     // Check if the plugin stored to the fields is still applicable.
     if (!$selected_plugin || !in_array($selected_plugin['type'], array_keys($plugin_options))) {
-      if (!empty($plugin_options)) {
-        $selected_plugin['type'] = array_keys($plugin_options)[0];
+      if (count($plugin_options) > 1) {
+        $selected_plugin['type'] = array_keys($plugin_options)[1];
       }
       else {
         $selected_plugin['type'] = 'hidden';
@@ -207,7 +210,7 @@ class DiffBuilderManager extends DefaultPluginManager {
   public function getApplicablePluginOptions(FieldStorageDefinitionInterface $field_definition) {
     $plugins = $this->getPluginDefinitions();
     // Build a list of all diff plugins supporting the field type of the field.
-    $plugin_options = [];
+    $plugin_options = ['hidden' => $this->t("- Don't compare -")];
     if (isset($plugins[$field_definition->getType()])) {
       // Sort the plugins based on their weight.
       uasort($plugins[$field_definition->getType()], 'Drupal\Component\Utility\SortArray::sortByWeightElement');
diff --git a/src/Form/FieldsSettingsForm.php b/src/Form/FieldsSettingsForm.php
index 4794b9e..0f538fd 100644
--- a/src/Form/FieldsSettingsForm.php
+++ b/src/Form/FieldsSettingsForm.php
@@ -438,9 +438,7 @@ class FieldsSettingsForm extends ConfigFormBase {
 
     // Set the plugin type as hidden, for fields which have no plugin selected.
     foreach ($fields as $field_key => $field_values) {
-      if ($field_values['plugin']['type'] == 'hidden') {
-        $this->config->set('fields.' . $field_key, ['type' => 'hidden']);
-      }
+      $this->config->set('fields.' . $field_key, $field_values['plugin']);
     }
     $this->config->save();
     // Save the settings, for fields which have a plugin selected.
@@ -460,15 +458,20 @@ class FieldsSettingsForm extends ConfigFormBase {
         }
         // If the settings are not set anywhere in the form state just save the
         // default configuration for the current plugin.
+        /**
+        Remove this default value aovid config overwrite.
         else {
           $settings = $plugin->defaultConfiguration();
         }
+        **/
         // Build a FormState object and call the plugin submit handler.
-        $state = new FormState();
-        $state->setValues($settings);
-        $state->set('fields', $field_key);
-
-        $plugin->submitConfigurationForm($form, $state);
+        if(isset($settings)){
+          $state = new FormState();
+          $state->setValues($settings);
+          $state->set('fields', $field_key);
+        
+          $plugin->submitConfigurationForm($form, $state);
+        }
       }
     }