diff --git a/src/ConflictDiscovery/DefaultConflictDiscovery.php b/src/ConflictDiscovery/DefaultConflictDiscovery.php
index 526be5f..ffe9492 100644
--- a/src/ConflictDiscovery/DefaultConflictDiscovery.php
+++ b/src/ConflictDiscovery/DefaultConflictDiscovery.php
@@ -4,6 +4,7 @@ namespace Drupal\conflict\ConflictDiscovery;
 
 use Drupal\conflict\ConflictTypes;
 use Drupal\conflict\Event\EntityConflictDiscoveryEvent;
+use Drupal\conflict\Utility\FieldHelper;
 
 class DefaultConflictDiscovery extends ConflictDiscoveryBase {
 
@@ -47,7 +48,7 @@ class DefaultConflictDiscovery extends ConflictDiscoveryBase {
         // Check for changes between the remote and the base entity versions.
         if (!$field_items_remote->equals($field_items_base)) {
           // Check for changes between the local and the base entity versions.
-          $conflict_type = $field_items_local->equals($field_items_base) ? ConflictTypes::CONFLICT_TYPE_REMOTE : ConflictTypes::CONFLICT_TYPE_LOCAL_REMOTE;
+          $conflict_type = ($field_items_local->equals($field_items_base) || FieldHelper::isDefaultValue($field_items_local)) ? ConflictTypes::CONFLICT_TYPE_REMOTE : ConflictTypes::CONFLICT_TYPE_LOCAL_REMOTE;
           $event->addConflict($field_name, $conflict_type);
         }
       }
diff --git a/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php b/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
index 21cb2c3..2e6f409 100644
--- a/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
+++ b/src/Plugin/Conflict/FieldComparator/FieldComparatorDefault.php
@@ -4,6 +4,7 @@ namespace Drupal\conflict\Plugin\Conflict\FieldComparator;
 
 use Drupal\conflict\ConflictTypes;
 use Drupal\conflict\FieldComparatorInterface;
+use Drupal\conflict\Utility\FieldHelper;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Plugin\PluginBase;
@@ -40,7 +41,7 @@ class FieldComparatorDefault extends PluginBase implements FieldComparatorInterf
       if ($this->hasChanged($server, $original, $langcode, $entity_type_id, $bundle, $field_type, $field_name)) {
         // Check for changes between the locally edited and locally used
         // original version.
-        $conflict_type = $this->hasChanged($local, $original, $langcode, $entity_type_id, $bundle, $field_type, $field_name)
+        $conflict_type = ($this->hasChanged($local, $original, $langcode, $entity_type_id, $bundle, $field_type, $field_name) && !FieldHelper::isDefaultValue($local))
           ? ConflictTypes::CONFLICT_TYPE_LOCAL_REMOTE : ConflictTypes::CONFLICT_TYPE_REMOTE;
         return $conflict_type;
       }
diff --git a/src/Utility/FieldHelper.php b/src/Utility/FieldHelper.php
new file mode 100644
index 0000000..8653d4d
--- /dev/null
+++ b/src/Utility/FieldHelper.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\conflict\Utility;
+
+use Drupal\Core\Field\FieldItemListInterface;
+
+final class FieldHelper {
+
+  /**
+   * Check if field has default value or is not set.
+   *
+   * @param \Drupal\Core\Field\FieldItemListInterface $field_items
+   *   Local field to inspect.
+   *
+   * @return bool
+   *   TRUE or FALSE, depending on whether the requirements are met.
+   */
+  public static function isDefaultValue(FieldItemListInterface $field_items) {
+    $items = $field_items->filterEmptyItems();
+    $return = $items->isEmpty();
+    // Check custom field widgets with their own data model.
+    if ($items->getString() === '') {
+      $return = TRUE;
+    }
+
+    return $return;
+  }
+
+}