diff --git a/src/Entity.php b/src/Entity.php
index d1ed43e2..4c4e172e 100644
--- a/src/Entity.php
+++ b/src/Entity.php
@@ -913,6 +913,7 @@ public function set(string $name, $value): void
         } else {
             $this->setData('data', $name, $value);
         }
+        $this->setData('get', $name, null);
     }
 
     /**
diff --git a/src/Model.php b/src/Model.php
index 8902a1b7..506fa42d 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -441,7 +441,7 @@ public function setSuffix(string $suffix)
      */
     public function getSuffix(): string
     {
-        return $this->suffix ?: '';
+        return $this->suffix ?? '';
     }
 
     /**