diff --git a/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res b/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res
index a8bb555e9..2a66fab37 100644
--- a/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res
+++ b/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res
@@ -5,18 +5,22 @@ open BarGraphTypes
 open FailedPaymentsDistributionUtils
 
 module TableModule = {
-  open FailedPaymentsDistributionTypes
   @react.component
-  let make = (~data, ~className="", ~selectedTab: string, ~isSmartRetryEnabled) => {
+  let make = (~data, ~className="", ~selectedTab: string) => {
+    open LogicUtils
     let (offset, setOffset) = React.useState(_ => 0)
+    let {filterValueJson} = React.useContext(FilterContext.filterContext)
+    let isSmartRetryEnabled =
+      filterValueJson->getString("is_smart_retry_enabled", "true")->getBoolFromString(true)
     let defaultSort: Table.sortedObject = {
       key: "",
       order: Table.INC,
     }
     let tableBorderClass = "border-2 border-solid  border-jp-gray-940 border-collapse border-opacity-30 dark:border-jp-gray-dark_table_border_color dark:border-opacity-30"
-    let defaultCol = isSmartRetryEnabled
-      ? Payments_Failure_Rate_Distribution
-      : Payments_Failure_Rate_Distribution_Without_Smart_Retries
+
+    let defaultCol = isSmartRetryEnbldForFailedPmtDist(
+      isSmartRetryEnabled->NewPaymentAnalyticsUtils.getSmartRetryMetricType,
+    )
     let visibleColumns = [defaultCol]->Array.concat([selectedTab->getColumn])
     let tableData = getTableData(data)
 
@@ -154,10 +158,7 @@ let make = (
             />
           | Table =>
             <TableModule
-              data={failedPaymentsDistribution}
-              className="mx-7"
-              selectedTab={groupBy.value}
-              isSmartRetryEnabled
+              data={failedPaymentsDistribution} className="mx-7" selectedTab={groupBy.value}
             />
           }}
         </div>
diff --git a/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res b/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res
index 2a2f5987d..4ac29b745 100644
--- a/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res
+++ b/src/screens/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res
@@ -160,3 +160,10 @@ let getKeyForModule = (field, ~isSmartRetryEnabled) => {
     Payments_Failure_Rate_Distribution_Without_Smart_Retries
   }->getStringFromVariant
 }
+
+let isSmartRetryEnbldForFailedPmtDist = isEnabled => {
+  switch isEnabled {
+  | Smart_Retry => Payments_Failure_Rate_Distribution
+  | Default => Payments_Failure_Rate_Distribution_Without_Smart_Retries
+  }
+}
diff --git a/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res b/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res
index 5cffcb69d..d79a68ccb 100644
--- a/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res
+++ b/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res
@@ -180,9 +180,9 @@ let tooltipFormatter = (~secondaryCategories, ~title, ~metricType) => {
   )->asTooltipPointFormatter
 }
 
-let getMetricType = is_smart_retry_enabled => {
+let getSmartRetryMetricType = isSmartRetryEnabled => {
   open NewAnalyticsTypes
-  switch is_smart_retry_enabled {
+  switch isSmartRetryEnabled {
   | true => Smart_Retry
   | false => Default
   }
diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSection.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSection.res
index 0191c2e8e..4289043cd 100644
--- a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSection.res
+++ b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSection.res
@@ -18,7 +18,7 @@ let make = (~entity: moduleEntity) => {
     filterValueJson
     ->getString("is_smart_retry_enabled", "true")
     ->getBoolFromString(true)
-    ->NewPaymentAnalyticsUtils.getMetricType
+    ->NewPaymentAnalyticsUtils.getSmartRetryMetricType
 
   let getData = async () => {
     setScreenState(_ => PageLoaderWrapper.Loading)