diff --git a/src/components/ftbot/TradeDetail.vue b/src/components/ftbot/TradeDetail.vue
index 54db97f3..ee23ee06 100644
--- a/src/components/ftbot/TradeDetail.vue
+++ b/src/components/ftbot/TradeDetail.vue
@@ -7,13 +7,22 @@
         <ValuePair description="Pair">{{ trade.pair }}</ValuePair>
         <ValuePair description="Open date">{{ timestampms(trade.open_timestamp) }}</ValuePair>
         <ValuePair description="Open Rate">{{ formatPrice(trade.open_rate) }}</ValuePair>
-        <ValuePair v-if="!trade.is_open" description="Close Rate">{{ formatPrice(trade.close_rate) }}</ValuePair>
-        <ValuePair description="Min Rate">{{ formatPrice(trade.min_rate) }}</ValuePair>
-        <ValuePair description="Max Rate">{{ formatPrice(trade.max_rate) }}</ValuePair>
+        <ValuePair v-if="!trade.is_open && trade.close_rate" description="Close Rate">{{
+          formatPrice(trade.close_rate)
+        }}</ValuePair>
+        <ValuePair v-if="trade.min_rate" description="Min Rate">{{
+          formatPrice(trade.min_rate)
+        }}</ValuePair>
+        <ValuePair v-if="trade.max_rate" description="Max Rate">{{
+          formatPrice(trade.max_rate)
+        }}</ValuePair>
         <ValuePair v-if="trade.close_timestamp" description="Close date">{{
           timestampms(trade.close_timestamp)
         }}</ValuePair>
-        <ValuePair v-if="trade.current_profit" description="Current Profit">
+        <ValuePair
+          v-if="trade.current_profit && trade.current_profit_abs"
+          description="Current Profit"
+        >
           {{ formatPercent(trade.current_profit) }} | {{ trade.current_profit_abs }}
         </ValuePair>
         <ValuePair v-if="trade.close_profit" description="Close Profit">
@@ -26,15 +35,21 @@
           {{ formatPercent(trade.stop_loss_pct / 100) }} |
           {{ formatPrice(trade.stop_loss_abs) }}
         </ValuePair>
-        <ValuePair description="Initial Stoploss">
+        <ValuePair
+          v-if="trade.initial_stop_loss_pct && trade.initial_stop_loss_abs"
+          description="Initial Stoploss"
+        >
           {{ formatPercent(trade.initial_stop_loss_pct / 100) }} |
-          {{ formatPrice(trade.initial_stop_loss) }}
+          {{ formatPrice(trade.initial_stop_loss_abs) }}
         </ValuePair>
-        <ValuePair v-if="trade.is_open" description="Current stoploss dist">
+        <ValuePair
+          v-if="trade.is_open && trade.stoploss_current_dist_ratio && trade.stoploss_current_dist"
+          description="Current stoploss dist"
+        >
           {{ formatPercent(trade.stoploss_current_dist_ratio) }} |
           {{ formatPrice(trade.stoploss_current_dist) }}
         </ValuePair>
-        <ValuePair description="Stoploss last updated">
+        <ValuePair v-if="trade.stoploss_last_update_timestamp" description="Stoploss last updated">
           {{ timestampms(trade.stoploss_last_update_timestamp) }}
         </ValuePair>
       </div>
diff --git a/src/types/trades.ts b/src/types/trades.ts
index 72d16349..f923147f 100644
--- a/src/types/trades.ts
+++ b/src/types/trades.ts
@@ -23,7 +23,10 @@ export interface Trade {
   fee_close_currency?: string;
 
   current_rate?: number;
+  /** Current profit as ratio */
   current_profit?: number;
+  current_profit_abs?: number;
+  current_profit_pct?: number;
   sell_reason?: string;
   min_rate?: number;
   max_rate?: number;
@@ -37,6 +40,10 @@ export interface Trade {
   initial_stop_loss_abs?: number;
   initial_stop_loss_ratio?: number;
   initial_stop_loss_pct?: number;
+
+  stoploss_current_dist?: number;
+  stoploss_current_dist_ratio?: number;
+  stoploss_current_dist_pct?: number;
   open_order_id?: string;
 }
 
@@ -54,19 +61,7 @@ export interface ClosedTrade extends Trade {
   fee_close_cost?: number;
   fee_close_currency?: string;
 
-  current_rate?: number;
-  sell_reason?: string;
-  min_rate?: number;
-  max_rate?: number;
-
-  stop_loss_abs: number;
-  stop_loss_ratio: number;
-  stop_loss_pct: number;
-  stoploss_order_id?: string;
-  stoploss_last_update?: string;
-  stoploss_last_update_timestamp?: number;
-  initial_stop_loss_abs?: number;
-  initial_stop_loss_ratio?: number;
-  initial_stop_loss_pct?: number;
-  open_order_id?: string;
+  sell_reason: string;
+  min_rate: number;
+  max_rate: number;
 }