diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ea14029..48e2a616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Add shareExpire-param to indicate if a share was removed due to its expiry - [#944](https://github.com/owncloud/activity/issues/944)
 - Automations in activity stream - [#942](https://github.com/owncloud/activity/issues/942)
 
+### Fixed
+
+- Expired public share has wrong activity message - [#965](https://github.com/owncloud/activity/issues/965)
 
 ## [2.6.0] - 2020-10-16
 
diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php
index 848c9bb6..2dc95fcd 100755
--- a/lib/FilesHooks.php
+++ b/lib/FilesHooks.php
@@ -436,7 +436,7 @@ protected function shareFileOrFolderByLink($fileSource, $itemType, $linkOwner, $
 		if ($isSharing) {
 			$actionSharer = 'shared_link_self';
 			$actionOwner = 'reshared_link_by';
-		} elseif ($this->currentUser !== $linkOwner) {
+		} elseif ($shareExpired === true) {
 			// Link expired
 			$actionSharer = 'link_expired';
 			$actionOwner = 'link_by_expired';