diff --git a/freqtrade/optimize/hyperopt_loss/hyperopt_loss_calmar.py b/freqtrade/optimize/hyperopt_loss/hyperopt_loss_calmar.py
index 2b591824f..1f7f8488f 100644
--- a/freqtrade/optimize/hyperopt_loss/hyperopt_loss_calmar.py
+++ b/freqtrade/optimize/hyperopt_loss/hyperopt_loss_calmar.py
@@ -11,7 +11,7 @@ from typing import Any, Dict
 from pandas import DataFrame
 
 from freqtrade.constants import Config
-from freqtrade.data.metrics import calculate_max_drawdown
+from freqtrade.data.metrics import calculate_calmar
 from freqtrade.optimize.hyperopt import IHyperOptLoss
 
 
@@ -23,42 +23,15 @@ class CalmarHyperOptLoss(IHyperOptLoss):
     """
 
     @staticmethod
-    def hyperopt_loss_function(
-        results: DataFrame,
-        trade_count: int,
-        min_date: datetime,
-        max_date: datetime,
-        config: Config,
-        processed: Dict[str, DataFrame],
-        backtest_stats: Dict[str, Any],
-        *args,
-        **kwargs
-    ) -> float:
+    def hyperopt_loss_function(results: DataFrame, trade_count: int,
+                               min_date: datetime, max_date: datetime,
+                               config: Config, *args, **kwargs) -> float:
         """
         Objective function, returns smaller number for more optimal results.
 
         Uses Calmar Ratio calculation.
         """
-        total_profit = backtest_stats["profit_total"]
-        days_period = (max_date - min_date).days
-
-        # adding slippage of 0.1% per trade
-        total_profit = total_profit - 0.0005
-        expected_returns_mean = total_profit.sum() / days_period * 100
-
-        # calculate max drawdown
-        try:
-            _, _, _, _, _, max_drawdown = calculate_max_drawdown(
-                results, value_col="profit_abs"
-            )
-        except ValueError:
-            max_drawdown = 0
-
-        if max_drawdown != 0:
-            calmar_ratio = expected_returns_mean / max_drawdown * msqrt(365)
-        else:
-            # Define high (negative) calmar ratio to be clear that this is NOT optimal.
-            calmar_ratio = -20.0
-
+        starting_balance = config['dry_run_wallet']
+        calmar_ratio = calculate_calmar(results, min_date, max_date, starting_balance)
         # print(expected_returns_mean, max_drawdown, calmar_ratio)
         return -calmar_ratio