diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index dbc47d2d43..a6a44b8902 100644
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -119,7 +119,9 @@ abstract class QBMapper {
 
 		$qb->execute();
 
-		$entity->setId((int) $qb->getLastInsertId());
+		if($entity->id === null) {
+			$entity->setId((int)$qb->getLastInsertId());
+		}
 
 		return $entity;
 	}