diff --git a/.changelog/2404.bugfix.md b/.changelog/2404.bugfix.md
new file mode 100644
index 0000000000..1803010569
--- /dev/null
+++ b/.changelog/2404.bugfix.md
@@ -0,0 +1 @@
+Refactor PercentageValue component
diff --git a/src/app/components/PercentageValue/index.tsx b/src/app/components/PercentageValue/index.tsx
index 312def4edc..37d06909a3 100644
--- a/src/app/components/PercentageValue/index.tsx
+++ b/src/app/components/PercentageValue/index.tsx
@@ -3,17 +3,17 @@ import { useTranslation } from 'react-i18next'
 import { calculatePercentage } from '../../utils/number-utils'
 
 type PercentageValueProps = {
-  adaptMaximumFractionDigits?: boolean
-  total?: number | string
   value: number | string | undefined
-  maximumFractionDigits?: number
+  total?: number | string
+  fractionDigits?: number
+  adaptive?: boolean
 }
 
 export const PercentageValue: FC<PercentageValueProps> = ({
-  maximumFractionDigits,
-  adaptMaximumFractionDigits = 2,
   value,
   total = 100,
+  fractionDigits = 2,
+  adaptive = false,
 }) => {
   const { t } = useTranslation()
 
@@ -23,6 +23,8 @@ export const PercentageValue: FC<PercentageValueProps> = ({
     return null
   }
 
+  const maximumFractionDigits = adaptive && percentageValue < 0.001 ? 3 : fractionDigits
+
   return (
     <>
       {t('common.valuePair', {
@@ -30,8 +32,7 @@ export const PercentageValue: FC<PercentageValueProps> = ({
         formatParams: {
           value: {
             style: 'percent',
-            maximumFractionDigits:
-              adaptMaximumFractionDigits && percentageValue < 0.001 ? 3 : maximumFractionDigits,
+            maximumFractionDigits,
           } satisfies Intl.NumberFormatOptions,
         },
       })}
diff --git a/src/app/components/UptimeStatus/index.tsx b/src/app/components/UptimeStatus/index.tsx
index 1d33f95527..4a3fecbbf2 100644
--- a/src/app/components/UptimeStatus/index.tsx
+++ b/src/app/components/UptimeStatus/index.tsx
@@ -55,10 +55,7 @@ export const UptimeStatus: FC<UptimeStatusProps> = ({ uptime, small }) => {
         ))}
       </div>
       {uptime?.window_uptime && uptime?.window_length && (
-        <PercentageValue
-          value={(uptime.window_uptime / uptime.window_length) * 100}
-          maximumFractionDigits={1}
-        />
+        <PercentageValue value={(uptime.window_uptime / uptime.window_length) * 100} fractionDigits={1} />
       )}
     </div>
   )
diff --git a/src/app/components/Validators/ValidatorCommission.tsx b/src/app/components/Validators/ValidatorCommission.tsx
index e531ce999c..00b48af5d4 100644
--- a/src/app/components/Validators/ValidatorCommission.tsx
+++ b/src/app/components/Validators/ValidatorCommission.tsx
@@ -6,5 +6,5 @@ type ValidatorCommissionProps = {
 }
 
 export const ValidatorCommission: FC<ValidatorCommissionProps> = ({ commission }) => {
-  return <PercentageValue value={commission} total={100000} />
+  return <PercentageValue value={commission} total={100000} fractionDigits={0} />
 }
diff --git a/src/app/components/Validators/ValidatorCumulativeVoting.tsx b/src/app/components/Validators/ValidatorCumulativeVoting.tsx
index 654a1b9f4b..e4ab375e48 100644
--- a/src/app/components/Validators/ValidatorCumulativeVoting.tsx
+++ b/src/app/components/Validators/ValidatorCumulativeVoting.tsx
@@ -30,7 +30,7 @@ export const ValidatorCumulativeVoting: FC<ValidatorCumulativeVotingProps> = ({
         }}
       />
       <span className="relative z-10">
-        <PercentageValue value={value} total={total} />
+        <PercentageValue value={value} total={total} fractionDigits={0} />
       </span>
     </div>
   )
diff --git a/src/app/components/Validators/index.tsx b/src/app/components/Validators/index.tsx
index a7c6d0ac70..4de035fd84 100644
--- a/src/app/components/Validators/index.tsx
+++ b/src/app/components/Validators/index.tsx
@@ -77,13 +77,8 @@ export const Validators: FC<ValidatorsProps> = ({ isLoading, limit, pagination,
       {
         align: TableCellAlign.Right,
         content: (
-          <PercentageValue
-            value={validator.voting_power}
-            total={stats?.total_voting_power}
-            adaptMaximumFractionDigits
-          />
+          <PercentageValue value={validator.voting_power} total={stats?.total_voting_power} adaptive />
         ),
-
         key: 'voting',
       },
       {
diff --git a/src/app/pages/ConsensusDashboardPage/SnapshotEpoch.tsx b/src/app/pages/ConsensusDashboardPage/SnapshotEpoch.tsx
index 2d4e7ebe79..8aee4ec80c 100644
--- a/src/app/pages/ConsensusDashboardPage/SnapshotEpoch.tsx
+++ b/src/app/pages/ConsensusDashboardPage/SnapshotEpoch.tsx
@@ -68,7 +68,7 @@ export const SnapshotEpoch: FC<{ scope: SearchScope }> = ({ scope }) => {
               <PercentageValue
                 value={completedBlocksInCurrentEpoch}
                 total={epochDiffHeight}
-                maximumFractionDigits={1}
+                fractionDigits={1}
               />
               )
             </>
diff --git a/src/app/pages/ValidatorDetailsPage/VotingPowerCard.tsx b/src/app/pages/ValidatorDetailsPage/VotingPowerCard.tsx
index e8ee811415..1592b23633 100644
--- a/src/app/pages/ValidatorDetailsPage/VotingPowerCard.tsx
+++ b/src/app/pages/ValidatorDetailsPage/VotingPowerCard.tsx
@@ -36,12 +36,7 @@ export const VotingPowerCard: FC<VotingPowerCardProps> = ({ validator, stats })
               max={stats.total_voting_power}
               label={
                 <span className="font-bold">
-                  <PercentageValue
-                    adaptMaximumFractionDigits
-                    value={validator.voting_power}
-                    total={stats.total_voting_power}
-                    maximumFractionDigits={2}
-                  />
+                  <PercentageValue value={validator.voting_power} total={stats.total_voting_power} adaptive />
                 </span>
               }
             />
diff --git a/src/app/pages/ValidatorDetailsPage/index.tsx b/src/app/pages/ValidatorDetailsPage/index.tsx
index 2cbcb1960e..d3ea091b48 100644
--- a/src/app/pages/ValidatorDetailsPage/index.tsx
+++ b/src/app/pages/ValidatorDetailsPage/index.tsx
@@ -236,7 +236,11 @@ export const ValidatorDetailsView: FC<{
               <dd>
                 {stats?.total_voting_power ? (
                   <>
-                    <PercentageValue value={validator.voting_power} total={stats.total_voting_power} />
+                    <PercentageValue
+                      value={validator.voting_power}
+                      total={stats.total_voting_power}
+                      adaptive
+                    />
                     &nbsp; ({new BigNumber(validator.voting_power).toFormat()})
                   </>
                 ) : (
@@ -306,11 +310,7 @@ export const ValidatorDetailsView: FC<{
           </dd>
           <dt>{t('validator.voting')}</dt>
           <dd>
-            <PercentageValue
-              value={validator.voting_power}
-              total={stats?.total_voting_power}
-              adaptMaximumFractionDigits
-            />
+            <PercentageValue value={validator.voting_power} total={stats?.total_voting_power} adaptive />
           </dd>
           <dt>{t('common.staked')}</dt>
           <dd>