diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 25106afa..7ecee1b2 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2264,6 +2264,10 @@ def workouts_view(request, message='', successmessage='',
         g_enddate = timezone.now()
         g_startdate = (timezone.now()-timedelta(days=15))
 
+    if not r.show_commutes:
+        workouts = workouts.exclude(is_commute=True)
+        g_workouts = g_workouts.exclude(is_commute=True)
+        
     workoutsnohr = workouts.exclude(averagehr__isnull=False)
     for w in workoutsnohr:  # pragma: no cover
         _ = dataprep.workout_trimp(w)