diff --git a/public/js/filters/filters.js b/public/js/filters/filters.js
index 9d2255d9e2..222a8bb30a 100644
--- a/public/js/filters/filters.js
+++ b/public/js/filters/filters.js
@@ -8,4 +8,10 @@ angular.module('habitrpg')
     return function (gp) {
       return Math.floor((gp - Math.floor(gp))*100);
     }
+  })
+  .filter('completedFilter', function(){
+    return function(tasks,_showCompleted) {
+      if (tasks[0].type != 'todo') return tasks;
+      return _.where(tasks, {completed:!!_showCompleted});
+    }
   })
\ No newline at end of file
diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade
index c032d8f794..19f34d7205 100644
--- a/views/shared/tasks/task.jade
+++ b/views/shared/tasks/task.jade
@@ -1,4 +1,4 @@
-li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && castEnd(task, "task", $event)', ng-class='{"cast-target":spell}')
+li(bindonce='list', ng-repeat='task in obj[list.type+"s"] | completedFilter: list.showCompleted', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && castEnd(task, "task", $event)', ng-class='{"cast-target":spell}')
   // right-hand side control buttons
   .task-meta-controls