diff --git a/components/Fund/FundraiseProgress.tsx b/components/Fund/FundraiseProgress.tsx
index e469fc7a7..ba95ec632 100644
--- a/components/Fund/FundraiseProgress.tsx
+++ b/components/Fund/FundraiseProgress.tsx
@@ -17,6 +17,7 @@ import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext';
 import { useShareModalContext } from '@/contexts/ShareContext';
 import { useRouter } from 'next/navigation';
 import { Tooltip } from '@/components/ui/Tooltip';
+import { getFundraiseDisplayAmounts } from './lib/getFundraiseDisplayAmounts';
 
 interface FundraiseProgressProps {
   fundraise: Fundraise;
@@ -52,20 +53,22 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
   if (!fundraise) return null;
 
   const deadlineText = fundraise.endDate ? formatDeadline(fundraise.endDate) : undefined;
+  const {
+    displayAmountRaisedUsd,
+    displayGoalAmountUsd,
+    displayAmountRaisedRsc,
+    displayGoalAmountRsc,
+    displayProgressPercent,
+  } = getFundraiseDisplayAmounts(fundraise);
 
   // Calculate progress percentage with a minimum of 5% for visibility
   const progressPercentage =
     fundraise.status === 'COMPLETED'
       ? 100
-      : Math.max(
-          0,
-          Math.min(100, Math.max(5, (fundraise.amountRaised.rsc / fundraise.goalAmount.rsc) * 100))
-        );
+      : Math.max(0, Math.min(100, Math.max(5, displayProgressPercent)));
 
   // Calculate actual percentage for display
-  const actualPercentage = Math.floor(
-    (fundraise.amountRaised.rsc / fundraise.goalAmount.rsc) * 100
-  );
+  const actualPercentage = Math.floor(displayProgressPercent);
 
   // Extract contributors if available
   const contributors =
@@ -189,8 +192,8 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                 <CurrencyBadge
                   amount={
                     showUSD
-                      ? Math.round(fundraise.amountRaised.usd)
-                      : Math.round(fundraise.amountRaised.rsc)
+                      ? Math.round(displayAmountRaisedUsd)
+                      : Math.round(displayAmountRaisedRsc)
                   }
                   variant="text"
                   size="xs"
@@ -205,9 +208,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                 </span>
                 <CurrencyBadge
                   amount={
-                    showUSD
-                      ? Math.round(fundraise.goalAmount.usd)
-                      : Math.round(fundraise.goalAmount.rsc)
+                    showUSD ? Math.round(displayGoalAmountUsd) : Math.round(displayGoalAmountRsc)
                   }
                   variant="text"
                   size="xs"
@@ -295,8 +296,8 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <CurrencyBadge
                     amount={
                       showUSD
-                        ? Math.round(fundraise.amountRaised.usd)
-                        : Math.round(fundraise.amountRaised.rsc)
+                        ? Math.round(displayAmountRaisedUsd)
+                        : Math.round(displayAmountRaisedRsc)
                     }
                     variant="text"
                     size="md"
@@ -308,9 +309,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <span className="text-gray-500 text-base mobile:!text-lg">raised of</span>
                   <CurrencyBadge
                     amount={
-                      showUSD
-                        ? Math.round(fundraise.goalAmount.usd)
-                        : Math.round(fundraise.goalAmount.rsc)
+                      showUSD ? Math.round(displayGoalAmountUsd) : Math.round(displayGoalAmountRsc)
                     }
                     variant="text"
                     size="md"
diff --git a/components/Fund/FundraiseProgressV2.tsx b/components/Fund/FundraiseProgressV2.tsx
index d6b5351e6..d3b71a53f 100644
--- a/components/Fund/FundraiseProgressV2.tsx
+++ b/components/Fund/FundraiseProgressV2.tsx
@@ -20,6 +20,7 @@ import { Tooltip } from '@/components/ui/Tooltip';
 import { StatusCard } from '@/components/ui/StatusCard';
 import { colors } from '@/app/styles/colors';
 import { useAuthenticatedAction } from '@/contexts/AuthModalContext';
+import { getFundraiseDisplayAmounts } from './lib/getFundraiseDisplayAmounts';
 
 interface FundraiseProgressProps {
   fundraise: Fundraise;
@@ -54,15 +55,19 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
   const isActive =
     fundraise.status === 'OPEN' &&
     (fundraise.endDate ? isDeadlineInFuture(fundraise.endDate) : true);
+  const {
+    displayAmountRaisedUsd,
+    displayGoalAmountUsd,
+    displayAmountRaisedRsc,
+    displayGoalAmountRsc,
+    displayProgressPercent,
+  } = getFundraiseDisplayAmounts(fundraise);
 
   // Calculate progress percentage with a minimum of 5% for visibility
   const progressPercentage =
     fundraise.status === 'COMPLETED'
       ? 100
-      : Math.max(
-          0,
-          Math.min(100, Math.max(5, (fundraise.amountRaised.rsc / fundraise.goalAmount.rsc) * 100))
-        );
+      : Math.max(0, Math.min(100, Math.max(5, displayProgressPercent)));
 
   // Extract contributors if available
   const contributors =
@@ -164,8 +169,8 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <CurrencyBadge
                     amount={
                       showUSD
-                        ? Math.round(fundraise.amountRaised.usd)
-                        : Math.round(fundraise.amountRaised.rsc)
+                        ? Math.round(displayAmountRaisedUsd)
+                        : Math.round(displayAmountRaisedRsc)
                     }
                     variant="text"
                     size="md"
@@ -183,9 +188,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <span className="text-xs text-gray-500 mx-0.5">/</span>
                   <CurrencyBadge
                     amount={
-                      showUSD
-                        ? Math.round(fundraise.goalAmount.usd)
-                        : Math.round(fundraise.goalAmount.rsc)
+                      showUSD ? Math.round(displayGoalAmountUsd) : Math.round(displayGoalAmountRsc)
                     }
                     variant="text"
                     size="md"
@@ -295,8 +298,8 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <CurrencyBadge
                     amount={
                       showUSD
-                        ? Math.round(fundraise.amountRaised.usd)
-                        : Math.round(fundraise.amountRaised.rsc)
+                        ? Math.round(displayAmountRaisedUsd)
+                        : Math.round(displayAmountRaisedRsc)
                     }
                     variant="text"
                     size="md"
@@ -308,9 +311,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   <span className="text-gray-500 text-base mobile:!text-lg">raised of</span>
                   <CurrencyBadge
                     amount={
-                      showUSD
-                        ? Math.round(fundraise.goalAmount.usd)
-                        : Math.round(fundraise.goalAmount.rsc)
+                      showUSD ? Math.round(displayGoalAmountUsd) : Math.round(displayGoalAmountRsc)
                     }
                     variant="text"
                     size="md"
diff --git a/components/Fund/lib/getFundraiseDisplayAmounts.ts b/components/Fund/lib/getFundraiseDisplayAmounts.ts
new file mode 100644
index 000000000..830d66749
--- /dev/null
+++ b/components/Fund/lib/getFundraiseDisplayAmounts.ts
@@ -0,0 +1,37 @@
+import type { Fundraise } from '@/types/funding';
+
+interface FundraiseDisplayAmounts {
+  displayAmountRaisedUsd: number;
+  displayGoalAmountUsd: number;
+  displayAmountRaisedRsc: number;
+  displayGoalAmountRsc: number;
+  displayProgressPercent: number;
+}
+
+export const getFundraiseDisplayAmounts = (fundraise: Fundraise): FundraiseDisplayAmounts => {
+  if (fundraise.status === 'COMPLETED') {
+    const completedUsd = fundraise.goalAmount.usd ?? 0;
+    const completedRsc = fundraise.amountRaised.rsc ?? 0;
+
+    return {
+      displayAmountRaisedUsd: completedUsd,
+      displayGoalAmountUsd: completedUsd,
+      displayAmountRaisedRsc: completedRsc,
+      displayGoalAmountRsc: completedRsc,
+      displayProgressPercent: 100,
+    };
+  }
+
+  const displayAmountRaisedRsc = fundraise.amountRaised.rsc ?? 0;
+  const displayGoalAmountRsc = fundraise.goalAmount.rsc ?? 0;
+  const displayProgressPercent =
+    displayGoalAmountRsc > 0 ? (displayAmountRaisedRsc / displayGoalAmountRsc) * 100 : 0;
+
+  return {
+    displayAmountRaisedUsd: fundraise.amountRaised.usd ?? 0,
+    displayGoalAmountUsd: fundraise.goalAmount.usd ?? 0,
+    displayAmountRaisedRsc,
+    displayGoalAmountRsc,
+    displayProgressPercent,
+  };
+};
diff --git a/components/work/components/FundraiseSection.tsx b/components/work/components/FundraiseSection.tsx
index 8554b33c0..b88dedb3c 100644
--- a/components/work/components/FundraiseSection.tsx
+++ b/components/work/components/FundraiseSection.tsx
@@ -3,9 +3,9 @@
 import { Fundraise } from '@/types/funding';
 import { BarChart3, Users } from 'lucide-react';
 import { Icon } from '@/components/ui/icons/Icon';
-import { formatRSC } from '@/utils/number';
 import { CurrencyBadge } from '@/components/ui/CurrencyBadge';
 import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext';
+import { getFundraiseDisplayAmounts } from '@/components/Fund/lib/getFundraiseDisplayAmounts';
 
 interface FundraiseSectionProps {
   fundraise: Fundraise;
@@ -13,7 +13,13 @@ interface FundraiseSectionProps {
 
 export function FundraiseSection({ fundraise }: FundraiseSectionProps) {
   const { showUSD } = useCurrencyPreference();
-  const progress = (fundraise.amountRaised.rsc / fundraise.goalAmount.rsc) * 100;
+  const {
+    displayAmountRaisedUsd,
+    displayGoalAmountUsd,
+    displayAmountRaisedRsc,
+    displayGoalAmountRsc,
+    displayProgressPercent,
+  } = getFundraiseDisplayAmounts(fundraise);
 
   return (
     <section>
@@ -26,7 +32,7 @@ export function FundraiseSection({ fundraise }: FundraiseSectionProps) {
         <div className="space-y-2">
           <div className="flex justify-between text-sm">
             <CurrencyBadge
-              amount={showUSD ? fundraise.amountRaised.usd : fundraise.amountRaised.rsc}
+              amount={showUSD ? displayAmountRaisedUsd : displayAmountRaisedRsc}
               variant="text"
               size="xs"
               currency={showUSD ? 'USD' : 'RSC'}
@@ -35,7 +41,7 @@ export function FundraiseSection({ fundraise }: FundraiseSectionProps) {
               skipConversion={showUSD}
             />
             <CurrencyBadge
-              amount={showUSD ? fundraise.goalAmount.usd : fundraise.goalAmount.rsc}
+              amount={showUSD ? displayGoalAmountUsd : displayGoalAmountRsc}
               variant="text"
               size="xs"
               currency={showUSD ? 'USD' : 'RSC'}
@@ -50,7 +56,7 @@ export function FundraiseSection({ fundraise }: FundraiseSectionProps) {
                 fundraise.status === 'COMPLETED' ? 'bg-green-500' : 'bg-orange-500'
               }`}
               style={{
-                width: `${fundraise.status === 'COMPLETED' ? 100 : progress}%`,
+                width: `${displayProgressPercent}%`,
               }}
             />
           </div>