diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php
index a1663fec..1a5c4eae 100644
--- a/Database/Base/BaseActiveRecord.php
+++ b/Database/Base/BaseActiveRecord.php
@@ -424,11 +424,12 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
 		if ($this->hasAutoIncrement()) {
 			return $this->setAttribute($this->getAutoIncrement(), (int)$lastId);
 		}
-		if ($this->hasPrimary()) {
-			$primary = $this->getPrimary();
-			if (!isset($param[$primary]) || empty($param[$primary])) {
-				$this->setAttribute($primary, (int)$lastId);
-			}
+		if (!$this->hasPrimary()) {
+			return $this;
+		}
+		$primary = $this->getPrimary();
+		if (!isset($param[$primary]) || empty($param[$primary])) {
+			$this->setAttribute($primary, (int)$lastId);
 		}
 		return $this->setAttributes($param);
 	}