diff --git a/BeSafePlus/ViewModels/ActivityHistoryViewModel.cs b/BeSafePlus/ViewModels/ActivityHistoryViewModel.cs
index cb3f7679dde7ebf3f1962cf250167f4c04ed388d..ad4e78dc56d25804d13a57d15df2962922187d41 100644
--- a/BeSafePlus/ViewModels/ActivityHistoryViewModel.cs
+++ b/BeSafePlus/ViewModels/ActivityHistoryViewModel.cs
@@ -241,16 +241,27 @@ namespace BeSafePlus.ViewModels
 
             int totalSteps = 0;
 
+            var newMonthlyData = new List<StepCount>();
+
             for (var date = firstDayOfMonth; date <= lastDayOfMonth; date = date.AddDays(1))
             {
                 var stepData = await _database.GetStepCountByDate(date);
 
                 if (stepData != null)
                 {
+                    newMonthlyData.Add(stepData);
+
                     totalSteps += stepData.Steps;
                 }
+
+                else
+                {
+                    newMonthlyData.Add(new StepCount { Date = date.ToString("yyyy-MM-dd"), Steps = 0 });
+                }
             }
 
+            MonthlyStepData = newMonthlyData;
+
             TotalStepsThisMonth = totalSteps;
         }
         private string GetWeekLabel()