diff --git a/ReportingServices.Shared/HelperClasses/APIHelperFunctions.cs b/ReportingServices.Shared/HelperClasses/APIHelperFunctions.cs
index b2061f3..cb91831 100644
--- a/ReportingServices.Shared/HelperClasses/APIHelperFunctions.cs
+++ b/ReportingServices.Shared/HelperClasses/APIHelperFunctions.cs
@@ -15,7 +15,7 @@ namespace ReportingServices.Shared.HelperClasses
             date = dayOfWeek switch
             {
                 0 => date.AddDays(-6),
-                1 => date.AddDays(-7),
+                1 => date,
                 _ => date.AddDays(1 - dayOfWeek)
             };
 
diff --git a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
index 149aa32..adea310 100644
--- a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
+++ b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
@@ -105,8 +105,10 @@
                     modifiedYieldedOuts = totalYieldedWafersOut - (Model.OutsByDay[index].TotalWafers - Model.ScrapByDay[index].TOT_REJ_WFRS - Model.ScrapByDay[index].TW_PROD);
                 else
                     modifiedYieldedOuts = totalYieldedWafersOut;
+
+                int averageYieldedOuts = yieldOutDays == 0 ? 0 : modifiedYieldedOuts / yieldOutDays;
             }
-            <td scope="row" colspan="10" id="expandYield" class="text-center">Yielded Wafers Out Daily Average: @(modifiedYieldedOuts / yieldOutDays)</td>
+            <td scope="row" colspan="10" id="expandYield" class="text-center">Yielded Wafers Out Daily Average: @(averageYieldedOuts)</td>
         </tr>
         <tr class="yield hidden">
             <td scope="row">Customer Scrap</td>