diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index eb822e234..6addf18ba 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -310,6 +310,7 @@ class RPC:
             'profit_all_percent': profit_all_percent,
             'profit_all_fiat': profit_all_fiat,
             'trade_count': len(trades),
+            'closed_trade_count': len([t for t in trades if not t.is_open]),
             'first_trade_date': arrow.get(first_date).humanize() if first_date else '',
             'first_trade_timestamp': int(first_date.timestamp() * 1000) if first_date else 0,
             'latest_trade_date': arrow.get(last_date).humanize() if last_date else '',
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 488fa9f37..78cdaef62 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -328,18 +328,23 @@ class Telegram(RPC):
             best_pair = stats['best_pair']
             best_rate = stats['best_rate']
             # Message to display
-            markdown_msg = "*ROI:* Close trades\n" \
-                           f"∙ `{profit_closed_coin:.8f} {stake_cur} "\
-                           f"({profit_closed_percent:.2f}%)`\n" \
-                           f"∙ `{profit_closed_fiat:.3f} {fiat_disp_cur}`\n" \
-                           f"*ROI:* All trades\n" \
-                           f"∙ `{profit_all_coin:.8f} {stake_cur} ({profit_all_percent:.2f}%)`\n" \
-                           f"∙ `{profit_all_fiat:.3f} {fiat_disp_cur}`\n" \
-                           f"*Total Trade Count:* `{trade_count}`\n" \
-                           f"*First Trade opened:* `{first_trade_date}`\n" \
-                           f"*Latest Trade opened:* `{latest_trade_date}`\n" \
-                           f"*Avg. Duration:* `{avg_duration}`\n" \
-                           f"*Best Performing:* `{best_pair}: {best_rate:.2f}%`"
+            if stats['closed_trade_count'] > 0:
+                markdown_msg = ("*ROI:* Close trades\n"
+                                f"∙ `{profit_closed_coin:.8f} {stake_cur} "
+                                f"({profit_closed_percent:.2f}%)`\n"
+                                f"∙ `{profit_closed_fiat:.3f} {fiat_disp_cur}`\n")
+            else:
+                markdown_msg = "`No closed trade` \n"
+
+            markdown_msg += (f"*ROI:* All trades\n"
+                             f"∙ `{profit_all_coin:.8f} {stake_cur} ({profit_all_percent:.2f}%)`\n"
+                             f"∙ `{profit_all_fiat:.3f} {fiat_disp_cur}`\n"
+                             f"*Total Trade Count:* `{trade_count}`\n"
+                             f"*First Trade opened:* `{first_trade_date}`\n"
+                             f"*Latest Trade opened:* `{latest_trade_date}`")
+            if stats['closed_trade_count'] > 0:
+                markdown_msg += (f"\n*Avg. Duration:* `{avg_duration}`\n"
+                                 f"*Best Performing:* `{best_pair}: {best_rate:.2f}%`")
             self._send_msg(markdown_msg)
         except RPCException as e:
             self._send_msg(str(e))
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index c68aae56d..5cab10244 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -431,7 +431,8 @@ def test_api_profit(botclient, mocker, ticker, fee, markets, limit_buy_order, li
                        'profit_closed_coin': 6.217e-05,
                        'profit_closed_fiat': 0,
                        'profit_closed_percent': 6.2,
-                       'trade_count': 1
+                       'trade_count': 1,
+                       'closed_trade_count': 1,
                        }
 
 
diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py
index 730bb2677..0b990281f 100644
--- a/tests/rpc/test_rpc_telegram.py
+++ b/tests/rpc/test_rpc_telegram.py
@@ -420,7 +420,7 @@ def test_profit_handle(default_conf, update, ticker, ticker_sell_up, fee,
 
     telegram._profit(update=update, context=MagicMock())
     assert msg_mock.call_count == 1
-    assert 'no closed trade' in msg_mock.call_args_list[0][0][0]
+    assert 'No closed trade' in msg_mock.call_args_list[0][0][0]
     msg_mock.reset_mock()
 
     # Create some test data
@@ -432,7 +432,9 @@ def test_profit_handle(default_conf, update, ticker, ticker_sell_up, fee,
 
     telegram._profit(update=update, context=MagicMock())
     assert msg_mock.call_count == 1
-    assert 'no closed trade' in msg_mock.call_args_list[-1][0][0]
+    assert 'No closed trade' in msg_mock.call_args_list[-1][0][0]
+    assert '*ROI:* All trades' in msg_mock.call_args_list[-1][0][0]
+    assert '∙ `-0.00000500 BTC (-0.50%)`' in msg_mock.call_args_list[-1][0][0]
     msg_mock.reset_mock()
 
     # Update the ticker with a market going up