diff --git a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
index f5a8e34..e9a0e8e 100644
--- a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
+++ b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
@@ -46,7 +46,7 @@ export default {
 
 	data() {
 		return {
-			date: new Date('2023-03-24'),
+			date: new Date(),
 			selectedTeam: null,
 			selectedDate: null,
 			time: null,
diff --git a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
index c96d5e9..ccddf7c 100644
--- a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
+++ b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
@@ -9,9 +9,12 @@ export default {
 			if (!this.subtasks || !this.blockers)
 				return
 
+			const blockers = this._generateBlockers()
+
 			return {
 				unscheduledTime: 333,
-				tasks: [...this._generateNonWorking(), ...this._generateTasks(), ...this._generateBlockers()]
+				tasks: [...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')],
+				homeoffices: [...blockers.filter(blocker => blocker.type == 'home_office')]
 			}
 		},
 
@@ -23,17 +26,18 @@ export default {
 				let workingHours = 0
 
 				this.calendarData.tasks.forEach(task => {
-					if ((task.subtask?.employee.id == employee.id) || (task.blocker?.employee?.id == employee.id))
+					if ((task.subtask?.employee.id != employee.id) && (task.blocker?.employee?.id != employee.id))
 						return
 
-					console.log(task.type)
-
-					if (task.type == 'home_office')
-						return homeoffice[task.split] = true
-
 					workingHours += timelineUtils._getDifferenceInHours(task.end, task.start)
 				})
 
+				this.calendarData.homeoffices.forEach(task => {
+					if (task.blocker.employee?.id != employee.id) return
+
+					homeoffice[task.split] = true
+				})
+
 				days.push({
 					id: index + 1,
 					name: employee.name,