diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05c1c2162..183bf0f6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Extended the analysis page to include the total amount, change and performance with currency effects
+- Extended the analysis page to include the total amount, change and performance with currency effects (experimental)
 
 ### Changed
 
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index b4170c2c5..517ad7101 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -75,68 +75,70 @@
     </div>
   }
 
-  <div class="mb-5 row">
-    <div class="col-lg-4 mb-3 mb-lg-0">
-      <mat-card appearance="outlined">
-        <mat-card-content>
-          <gf-value
-            i18n
-            size="large"
-            [isCurrency]="true"
-            [locale]="user?.settings?.locale"
-            [precision]="precision"
-            [unit]="user?.settings?.baseCurrency"
-            [value]="
-              isLoadingInvestmentChart
-                ? undefined
-                : performance?.currentValueInBaseCurrency
-            "
-            >Total amount</gf-value
-          >
-        </mat-card-content>
-      </mat-card>
-    </div>
-    <div class="col-lg-4 mb-3 mb-lg-0">
-      <mat-card appearance="outlined">
-        <mat-card-content>
-          <gf-value
-            i18n
-            size="large"
-            [colorizeSign]="true"
-            [isCurrency]="true"
-            [locale]="user?.settings?.locale"
-            [precision]="precision"
-            [unit]="user?.settings?.baseCurrency"
-            [value]="
-              isLoadingInvestmentChart
-                ? undefined
-                : performance?.netPerformanceWithCurrencyEffect
-            "
-            >Change with currency effect</gf-value
-          >
-        </mat-card-content>
-      </mat-card>
-    </div>
-    <div class="col-lg-4">
-      <mat-card appearance="outlined">
-        <mat-card-content>
-          <gf-value
-            i18n
-            size="large"
-            [colorizeSign]="true"
-            [isPercent]="true"
-            [locale]="user?.settings?.locale"
-            [value]="
-              isLoadingInvestmentChart
-                ? undefined
-                : performance?.netPerformancePercentageWithCurrencyEffect
-            "
-            >Performance with currency effect</gf-value
-          >
-        </mat-card-content>
-      </mat-card>
+  @if (user?.settings?.isExperimentalFeatures) {
+    <div class="mb-5 row">
+      <div class="col-lg-4 mb-3 mb-lg-0">
+        <mat-card appearance="outlined">
+          <mat-card-content>
+            <gf-value
+              i18n
+              size="large"
+              [isCurrency]="true"
+              [locale]="user?.settings?.locale"
+              [precision]="precision"
+              [unit]="user?.settings?.baseCurrency"
+              [value]="
+                isLoadingInvestmentChart
+                  ? undefined
+                  : performance?.currentValueInBaseCurrency
+              "
+              >Total amount</gf-value
+            >
+          </mat-card-content>
+        </mat-card>
+      </div>
+      <div class="col-lg-4 mb-3 mb-lg-0">
+        <mat-card appearance="outlined">
+          <mat-card-content>
+            <gf-value
+              i18n
+              size="large"
+              [colorizeSign]="true"
+              [isCurrency]="true"
+              [locale]="user?.settings?.locale"
+              [precision]="precision"
+              [unit]="user?.settings?.baseCurrency"
+              [value]="
+                isLoadingInvestmentChart
+                  ? undefined
+                  : performance?.netPerformanceWithCurrencyEffect
+              "
+              >Change with currency effect</gf-value
+            >
+          </mat-card-content>
+        </mat-card>
+      </div>
+      <div class="col-lg-4">
+        <mat-card appearance="outlined">
+          <mat-card-content>
+            <gf-value
+              i18n
+              size="large"
+              [colorizeSign]="true"
+              [isPercent]="true"
+              [locale]="user?.settings?.locale"
+              [value]="
+                isLoadingInvestmentChart
+                  ? undefined
+                  : performance?.netPerformancePercentageWithCurrencyEffect
+              "
+              >Performance with currency effect</gf-value
+            >
+          </mat-card-content>
+        </mat-card>
+      </div>
     </div>
-  </div>
+  }
 
   <div class="mb-5 row">
     <div class="col-lg">