diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 1517b167..4df97b7e 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -1027,11 +1026,10 @@ public function __unset($name) {
     // Unsetting a field means emptying it.
     if ($this->hasField($name)) {
       $this->get($name)->setValue(array());
     }
+
     // For non-field properties, unset the internal value.
-    else {
-      unset($this->values[$name]);
-    }
+    unset($this->values[$name]);
   }
 
   /**