diff --git a/includes/entity.inc b/includes/entity.inc
index 5442f69..9bbd53f 100644
--- a/includes/entity.inc
+++ b/includes/entity.inc
@@ -122,6 +122,9 @@ class Entity {
     if (empty($this->wrapper)) {
       $this->wrapper = entity_metadata_wrapper($this->entityType, $this);
     }
+    elseif ($this->wrapper->value() !== $this) {
+      $this->wrapper->set($this);
+    }
     return $this->wrapper;
   }