diff --git a/models/User.py b/models/User.py
index e322983..066ebf5 100644
--- a/models/User.py
+++ b/models/User.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from flask_login import UserMixin
 from db.SQLiteClient import (create_user, get_user, get_user_by_email, update_user, delete_user,
                              get_habitLists, get_heatmap_value)
@@ -59,7 +61,14 @@ class User(UserMixin):
 
     # Returns all heatmap-values from the last 28 days
     def get_heatmap(self) -> list:
+        # get current day of week as integer. monday is 1 and sunday is 7
+        weekday = datetime.today().weekday() + 1
         heatmap = []
+
+        # append the heatmap values of the current week
+        for day in range(0, weekday):
+            heatmap.append(0)
+
         for day in range (0, 28):
             value = get_heatmap_value(self.id, day)
             heatmap.append(value)