diff --git a/CHANGELOG.md b/CHANGELOG.md
index c531a7c7..ea3614b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the caching of the portfolio snapshot in the portfolio calculator by expiring cache entries when a user changes tags in the holding detail dialog
 - Improved the language localization for German (`de`)
 
 ## 2.137.1 - 2025-02-01
diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index e8081135..a26099e9 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -63,14 +63,14 @@ export class OrderService {
       }
     });
 
-    return Promise.all(
+    await Promise.all(
       orders.map(({ id }) =>
         this.prismaService.order.update({
           data: {
             tags: {
               // The set operation replaces all existing connections with the provided ones
-              set: tags.map(({ id }) => {
-                return { id };
+              set: tags.map((tag) => {
+                return { id: tag.id };
               })
             }
           },
@@ -78,6 +78,13 @@ export class OrderService {
         })
       )
     );
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId
+      })
+    );
   }
 
   public async createOrder(