diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp
index 59f3c70881a0e..d799856ac9661 100644
--- a/src/gui/tray/activitydata.cpp
+++ b/src/gui/tray/activitydata.cpp
@@ -99,8 +99,13 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP
                 parameterJsonObject.contains(QStringLiteral("path")) ? parameterJsonObject.value(QStringLiteral("path")).toString() : QString(),
                 parameterJsonObject.contains(QStringLiteral("link")) ? stringToUrl(parameterJsonObject.value(QStringLiteral("link")).toString()) : QUrl(),
             };
+
+            if (activity._objectType == "calendar") {
+                activity._link = activity._subjectRichParameters[i.key()].link;
+            }
         }
 
+
         auto displayString = activity._subjectRich;
         auto subjectRichParameterMatch = subjectRichParameterRe.globalMatch(displayString);
 
diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index d0fce5efa8864..f0c6673c639a1 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -429,13 +429,6 @@ void ActivityListModel::ingestActivities(const QJsonArray &activities)
 
         auto a = Activity::fromActivityJson(json, _accountState->account());
 
-        if (a._objectType == "calendar") {
-            constexpr auto event = "event";
-            constexpr auto event1 = "event1";
-            const auto key = a._subjectRichParameters.contains(event)? event : event1;
-            a._link = a._subjectRichParameters[key].link;
-        }
-
         list.append(a);
         _currentItem = list.last()._id;