diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index 54040b22..789dca0d 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -1,4 +1,4 @@
-section.home-project-list(ng-show="vm.projects.size")
+section.home-project-list(ng-if="vm.projects.size")
     ul
         li.home-project-list-single(tg-bind-scope, tg-repeat="project in vm.projects")
             a(href="#", tg-nav="project:project=project.get('slug')")
@@ -17,7 +17,7 @@ section.home-project-list(ng-show="vm.projects.size")
         translate="PROJECT.NAVIGATION.SEE_MORE_PROJECTS"
     )
 
-section.projects-empty(ng-show="!vm.projects.size")
+section.projects-empty(ng-if="vm.projects != undefined && vm.projects.size === 0")
     include ../../../svg/empty-project.svg
     p(translate="HOME.EMPTY_PROJECT_LIST")
     a.create-project-button.button-green(href="#", ng-click="vm.newProject()",
diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade
index f12edae1..dc4a70ca 100644
--- a/app/modules/home/working-on/working-on.jade
+++ b/app/modules/home/working-on/working-on.jade
@@ -1,19 +1,19 @@
 section.working-on-container
     .title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
 
-    .working-on(ng-show="vm.assignedTo.size")
+    .working-on(ng-if="vm.assignedTo.size")
         .duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}")
 
-    .working-on-empty(ng-show="!vm.assignedTo.size")
+    .working-on-empty(ng-if="vm.assignedTo != undefined && vm.assignedTo.size === 0")
         p(translate="HOME.EMPTY_WORKING_ON")
         include empty.jade
 
 section.watching-container
     .title-bar.watching-title(translate="HOME.WATCHING_SECTION")
 
-    .watching(ng-show="vm.watching.size")
+    .watching(ng-if="vm.watching.size")
         .duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}")
 
-    .watching-empty(ng-show="!vm.watching.size")
+    .watching-empty(ng-if="vm.watching != undefined && vm.watching.size === 0")
         p(translate="HOME.EMPTY_WATCHING")
         include empty.jade