diff --git a/src/lib/components/NextEarnings.svelte b/src/lib/components/NextEarnings.svelte
index 92f4380d..17c5c941 100644
--- a/src/lib/components/NextEarnings.svelte
+++ b/src/lib/components/NextEarnings.svelte
@@ -21,7 +21,11 @@
   $: {
     if ($stockTicker && typeof window !== "undefined") {
       rawData = data?.getNextEarnings;
-      epsRatio = ((rawData?.epsEst / rawData?.epsPrior - 1) * 100)?.toFixed(2);
+      epsRatio =
+        rawData?.epsPrior !== 0
+          ? ((rawData?.epsEst / rawData?.epsPrior - 1) * 100)?.toFixed(2)
+          : null;
+
       revenueRatio = (
         (rawData?.revenueEst / rawData?.revenuePrior - 1) *
         100
@@ -72,15 +76,20 @@
             ? "before:content-['+'] text-[#00FC50]"
             : 'text-[#FF2F1F]'} ">{abbreviateNumber(revenueRatio)}%</span
         >
-        YoY {revenueRatio > 0 ? "growth" : revenueRatio < 0 ? "shrinking" : ""} and
-        earnings per share of
-        <span class="font-semibold">{rawData?.epsEst}</span>, making a
-        <span
-          class="{epsRatio > 0
-            ? "before:content-['+'] text-[#00FC50]"
-            : 'text-[#FF2F1F]'} ">{epsRatio}%</span
-        >
-        {epsRatio > 0 ? "increase" : epsRatio < 0 ? "decrease" : ""} YoY.
+        YoY {revenueRatio > 0 ? "growth" : revenueRatio < 0 ? "shrinking" : ""}
+        {#if epsRatio !== null}
+          and earnings per share of
+          <span class="font-semibold">{rawData?.epsEst}</span>, making a
+          <span
+            class="{epsRatio > 0
+              ? "before:content-['+'] text-[#00FC50]"
+              : 'text-[#FF2F1F]'} ">{epsRatio}%</span
+          >
+          {epsRatio > 0 ? "increase" : epsRatio < 0 ? "decrease" : ""} YoY.
+        {:else}
+          and earnings per share of
+          <span class="font-semibold">{rawData?.epsEst}</span>.
+        {/if}
       </div>
     </div>
   </div>
diff --git a/src/routes/earnings-calendar/+page.svelte b/src/routes/earnings-calendar/+page.svelte
index 134c4143..6b0696a6 100644
--- a/src/routes/earnings-calendar/+page.svelte
+++ b/src/routes/earnings-calendar/+page.svelte
@@ -548,7 +548,7 @@
                                       ? item?.epsEst?.toFixed(2)
                                       : "-"}
                                   </span>
-                                  {#if item?.epsEst !== null && item?.epsPrior !== null}
+                                  {#if item?.epsEst !== null && item?.epsPrior !== null && item?.epsPrior !== 0}
                                     {#if item?.epsEst / item?.epsPrior - 1 >= 0}
                                       <span class="ml-1 text-[#22C55E]">
                                         +{(