diff --git a/lib/Model/ShareWrapper.php b/lib/Model/ShareWrapper.php
index 0a4d10fa4..1544771e1 100644
--- a/lib/Model/ShareWrapper.php
+++ b/lib/Model/ShareWrapper.php
@@ -499,9 +499,9 @@ public function import(array $data): IDeserializable {
 		$this->importAttributesFromDatabase($this->get('attributes', $data));
 
 		try {
-			$expirationDate = $this->get('expiration', $data);
-			if ($expirationDate !== '') {
-				$this->setExpirationDate(new DateTime($expirationDate));
+			$expirationDate = $this->getInt('expiration', $data);
+			if ($expirationDate > 0) {
+				$this->setExpirationDate((new DateTime())->setTimestamp($expirationDate));
 			}
 		} catch (\Exception $e) {
 		}
@@ -565,7 +565,7 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow
 			 ->setShareNote($this->get($prefix . 'note', $data));
 
 		try {
-			$expirationDate = $this->get('expiration', $data);
+			$expirationDate = $this->get($prefix . 'expiration', $data);
 			if ($expirationDate !== '') {
 				$this->setExpirationDate(new DateTime($expirationDate));
 			}
@@ -630,6 +630,7 @@ public function jsonSerialize(): array {
 			'itemTarget' => $this->getItemTarget(),
 			'fileSource' => $this->getFileSource(),
 			'fileTarget' => $this->getFileTarget(),
+			'expiration' => $this->getExpirationDate()?->getTimestamp(),
 			'status' => $this->getStatus(),
 			'shareTime' => $this->getShareTime()->getTimestamp(),
 			'note' => $this->getShareNote(),