diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04197b317..edbc03804 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.23.1 - 03.07.2021
+
+### Fixed
+
+- Fixed the investment chart (drafts)
+
 ## 1.23.0 - 03.07.2021
 
 ### Added
diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts
index 4915f00b7..9540dceb5 100644
--- a/apps/api/src/models/portfolio.ts
+++ b/apps/api/src/models/portfolio.ts
@@ -118,23 +118,19 @@ export class Portfolio implements PortfolioInterface {
     this.getOrders()
       .filter((order) => order.getIsDraft() === true)
       .forEach((order) => {
+        investment += this.exchangeRateDataService.toCurrency(
+          order.getTotal(),
+          order.getCurrency(),
+          this.user.Settings.currency
+        );
+
         const portfolioItem = this.portfolioItems.find((item) => {
           return item.date === order.getDate();
         });
 
         if (portfolioItem) {
-          portfolioItem.investment += this.exchangeRateDataService.toCurrency(
-            order.getTotal(),
-            order.getCurrency(),
-            this.user.Settings.currency
-          );
+          portfolioItem.investment = investment;
         } else {
-          investment += this.exchangeRateDataService.toCurrency(
-            order.getTotal(),
-            order.getCurrency(),
-            this.user.Settings.currency
-          );
-
           this.portfolioItems.push({
             investment,
             date: order.getDate(),