diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index 2c951662..6526d500 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -131,7 +131,8 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
                     @scope.usTasks[us.id][status.id] = []
 
             for task in @scope.tasks
-                @scope.usTasks[task.user_story][task.status].push(task)
+                if @scope.usTasks[task.user_story]? and @scope.usTasks[task.user_story][task.status]?
+                    @scope.usTasks[task.user_story][task.status].push(task)
 
             return tasks