diff --git a/lib/Model/ScheduledMessage.php b/lib/Model/ScheduledMessage.php
index e74fdb58c2f..6003b370064 100644
--- a/lib/Model/ScheduledMessage.php
+++ b/lib/Model/ScheduledMessage.php
@@ -11,13 +11,11 @@
 
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\ResponseDefinitions;
-use OCP\AppFramework\Db\Entity;
+use OCP\AppFramework\Db\SnowflakeAwareEntity;
 use OCP\Comments\MessageTooLongException;
 use OCP\DB\Types;
 
 /**
- * @method string getId()
- * @method void setId(string $id)
  * @method void setRoomId(int $roomId)
  * @method int getRoomId()
  * @method void setActorId(string $actorId)
@@ -38,7 +36,7 @@
  *
  * @psalm-import-type TalkScheduledMessage from ResponseDefinitions
  */
-class ScheduledMessage extends Entity {
+class ScheduledMessage extends SnowflakeAwareEntity {
 	public const METADATA_THREAD_TITLE = 'threadTitle';
 	public const METADATA_THREAD_ID = 'threadId';
 	public const METADATA_SILENT = 'silent';
diff --git a/lib/Model/ScheduledMessageMapper.php b/lib/Model/ScheduledMessageMapper.php
index ecf73b1cee7..4af53a875ab 100644
--- a/lib/Model/ScheduledMessageMapper.php
+++ b/lib/Model/ScheduledMessageMapper.php
@@ -10,7 +10,6 @@
 
 use OCA\Talk\Room;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
@@ -127,11 +126,4 @@ public function getMessagesDue(\DateTime $dateTime): array {
 
 		return $this->findEntities($query);
 	}
-
-	#[\Override]
-	public function insert(Entity $entity): Entity {
-		/** @psalm-suppress InvalidArgument */
-		$entity->setId($this->generator->nextId());
-		return parent::insert($entity);
-	}
 }