diff --git a/packages/shared/src/utils/helpers/details.ts b/packages/shared/src/utils/helpers/details.ts
index 305fc1586027..b6cf0b6e8e66 100644
--- a/packages/shared/src/utils/helpers/details.ts
+++ b/packages/shared/src/utils/helpers/details.ts
@@ -65,11 +65,11 @@ export const getDurationUnitText = (obj_duration: moment.Duration, should_ignore
         return days_value <= 2 ? unit_map.d.name_singular : unit_map.d.name_plural;
     }
     if (duration_ms >= TIME.HOUR && duration_ms < TIME.DAY) {
-        if (!should_ignore_end_time && isEndTime(duration_ms / (TIME.SECOND * 60 * 60))) return '';
+        if (!should_ignore_end_time && isEndTime(duration_ms / TIME.HOUR)) return '';
         return duration_ms === TIME.HOUR ? unit_map.h.name_singular : unit_map.h.name_plural;
     }
     if (duration_ms >= TIME.MINUTE && duration_ms < TIME.HOUR) {
-        if (!should_ignore_end_time && isEndTime(duration_ms / (TIME.SECOND * 60))) return '';
+        if (!should_ignore_end_time && isEndTime(duration_ms / TIME.MINUTE)) return '';
         return duration_ms === TIME.MINUTE ? unit_map.m.name_singular : unit_map.m.name_plural;
     }
     if (duration_ms >= TIME.SECOND && duration_ms < TIME.MINUTE) {
diff --git a/packages/trader/src/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx b/packages/trader/src/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx
index 2db69e2f478e..54b34ba95d1c 100644
--- a/packages/trader/src/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx
+++ b/packages/trader/src/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx
@@ -53,6 +53,7 @@ const ContractTypeWidget = ({ is_equal, name, value, list, onChange, languageCha
         if (selected_item && selected_item.value !== value) {
             onChange({ target: { name, value: selected_item.value } });
         }
+        // don't include value into the dependency array, it'll breake TradeTypeTab component
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [selected_item, onChange, name]);