diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index e4287d8f175d1..42b61a5d846b5 100644
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -303,7 +303,7 @@ void LinkShare::slotExpireDateSet(const QJsonDocument &reply, const QVariant &va
      * they use this date.
      */
     if (data.value("expiration"_L1).isString()) {
-        _expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
+        _expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
     } else {
         _expireDate = value.toDate();
     }
@@ -400,7 +400,7 @@ void UserGroupShare::slotExpireDateSet(const QJsonDocument &reply, const QVarian
      * they use this date.
      */
     if (data.value("expiration"_L1).isString()) {
-        _expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
+        _expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
     } else {
         _expireDate = value.toDate();
     }
@@ -608,7 +608,7 @@ QSharedPointer<UserGroupShare> ShareManager::parseUserGroupShare(const QJsonObje
 
     QDate expireDate;
     if (data.value("expiration"_L1).isString()) {
-        expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
+        expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
     }
 
     QString note;
@@ -649,7 +649,7 @@ QSharedPointer<LinkShare> ShareManager::parseLinkShare(const QJsonObject &data)
 
     QDate expireDate;
     if (data.value("expiration"_L1).isString()) {
-        expireDate = QDate::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd 00:00:00");
+        expireDate = QDateTime::fromString(data.value("expiration"_L1).toString(), "yyyy-MM-dd hh:mm:ss").date();
     }
     
     QString note;
diff --git a/test/sharetestutils.cpp b/test/sharetestutils.cpp
index e2e8dd02f472d..95225202f11ca 100644
--- a/test/sharetestutils.cpp
+++ b/test/sharetestutils.cpp
@@ -340,10 +340,10 @@ QNetworkReply *ShareTestHelper::handleSharePutOperation(const QNetworkAccessMana
                 auto requestKey = requestSplit.first();
                 auto requestValue = requestSplit.last();
 
-                     // We send expireDate without time but the server returns with time at 00:00:00
+                     // We send expireDate without time but the server returns with time at 23:59:59
                 if (requestKey == "expireDate") {
                     requestKey = "expiration";
-                    requestValue.append(" 00:00:00");
+                    requestValue.append(" 23:59:59");
                 }
 
                 shareObject.insert(QString(requestKey), QString(requestValue));
diff --git a/test/sharetestutils.h b/test/sharetestutils.h
index 4cdd4280e62c3..26a19e91657df 100644
--- a/test/sharetestutils.h
+++ b/test/sharetestutils.h
@@ -92,7 +92,7 @@ class ShareTestHelper : public QObject
 
     static constexpr auto testFileName = "file.md";
     static constexpr auto searchResultsReplyDelay = 100;
-    static constexpr auto expectedDtFormat = "yyyy-MM-dd 00:00:00";
+    static constexpr auto expectedDtFormat = "yyyy-MM-dd 23:59:59";
 
     const QByteArray createNewShare(const Share::ShareType shareType, const QString &shareWith, const QString &password);
     [[nodiscard]] int shareCount() const;