diff --git a/src/ORM/FieldType/DBClassName.php b/src/ORM/FieldType/DBClassName.php
index 0b59435934b..48229afda0b 100644
--- a/src/ORM/FieldType/DBClassName.php
+++ b/src/ORM/FieldType/DBClassName.php
@@ -151,6 +151,8 @@ public function setValue($value, $record = null, $markChanged = true)
         if ($record instanceof DataObject) {
             $this->record = $record;
         }
+
+        return $this;
     }
 
     public function getDefault()
diff --git a/src/ORM/FieldType/DBPrimaryKey.php b/src/ORM/FieldType/DBPrimaryKey.php
index 13c047a5e82..8132bfa3f91 100644
--- a/src/ORM/FieldType/DBPrimaryKey.php
+++ b/src/ORM/FieldType/DBPrimaryKey.php
@@ -68,5 +68,7 @@ public function setValue($value, $record = null, $markChanged = true)
         if ($record instanceof DataObject) {
             $this->object = $record;
         }
+
+        return $this;
     }
 }