diff --git a/templates/partials/page/calendar.html b/templates/partials/page/calendar.html
index 07dcca0..bb8ae2e 100644
--- a/templates/partials/page/calendar.html
+++ b/templates/partials/page/calendar.html
@@ -89,7 +89,7 @@
                     <span class="text-gray-500 font-semibold">{{ date.day }}</span>
                 </div>
                 <div class="bottom flex-grow h-30 py-1 w-full">
-                    {% if workout %}
+                    {% if workout['TopSets']|length > 0 %}
                     {% for topset in workout['TopSets'] %}
                     <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">{{ topset['ExerciseName'] }}</span>
diff --git a/utils.py b/utils.py
index a7ce87a..00df07a 100644
--- a/utils.py
+++ b/utils.py
@@ -15,7 +15,7 @@ def get_workouts(topsets):
         workouts.append({
             'WorkoutId': workout_id,
             'StartDate': topsets_in_workout[0]['StartDate'],
-            'TopSets': [{"TopSetId": t['TopSetId'], "ExerciseId": t['ExerciseId'], "ExerciseName": t['ExerciseName'], "Weight": t['Weight'], "Repetitions": t['Repetitions']} for t in topsets_in_workout]
+            'TopSets': [{"TopSetId": t['TopSetId'], "ExerciseId": t['ExerciseId'], "ExerciseName": t['ExerciseName'], "Weight": t['Weight'], "Repetitions": t['Repetitions']} for t in topsets_in_workout if t['TopSetId'] is not None]
         })
     return workouts