diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index fe814284fb..cd0ad49b6a 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -393,9 +393,7 @@ class FederatedShareProvider implements IShareProvider {
 		$qb->setValue('file_target', $qb->createNamedParameter(''));
 
 		$qb->execute();
-		$id = $qb->getLastInsertId();
-
-		return (int)$id;
+		return $qb->getLastInsertId();
 	}
 
 	/**
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 03e46c8e02..2484ccdd72 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -690,9 +690,7 @@ class ShareByMailProvider implements IShareProvider {
 		$qb->setValue('file_target', $qb->createNamedParameter(''));
 
 		$qb->execute();
-		$id = $qb->getLastInsertId();
-
-		return (int)$id;
+		return $qb->getLastInsertId();
 	}
 
 	/**
diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index 72373ba26c..8c324d9c60 100644
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -136,7 +136,7 @@ abstract class QBMapper {
 
 		if ($entity->id === null) {
 			// When autoincrement is used id is always an int
-			$entity->setId((int)$qb->getLastInsertId());
+			$entity->setId($qb->getLastInsertId());
 		}
 
 		return $entity;