diff --git a/components/DailyOverview.tsx b/components/DailyOverview.tsx
index 147e11c..ab5c1d7 100644
--- a/components/DailyOverview.tsx
+++ b/components/DailyOverview.tsx
@@ -18,7 +18,7 @@ import { DESKTOP_DISPLAY_ITEM_COUNT } from '@/lib/constants'
 import { Habit, WishlistItemType } from '@/lib/types'
 import { cn, d2t, getNow, getTodayInTimezone, isHabitDue, isSameDate, isTaskOverdue, t2d } from '@/lib/utils'
 import { useAtom } from 'jotai'
-import { AlertTriangle, ArrowRight, ChevronDown, ChevronUp, Circle, CircleCheck, Coins, Pin, Plus } from 'lucide-react';
+import { AlertTriangle, ArrowRight, ChevronDown, ChevronUp, Circle, CircleCheck, Coins, Pin, Plus } from 'lucide-react'
 import { useTranslations } from 'next-intl'
 import Link from 'next/link'
 import { useState } from 'react'
@@ -409,7 +409,7 @@ export default function DailyOverview({
         <CardContent>
           <div className="space-y-6">
             {/* Tasks Section */}
-            {habits.some(habit => habit.isTask === true) && (
+            {dailyTasks.length > 0 && (
               <ItemSection
                 title={t('dailyTasksTitle')}
                 items={dailyTasks}
@@ -421,16 +421,16 @@ export default function DailyOverview({
             )}
 
             {/* Habits Section */}
-            <ItemSection
+            {dailyHabits.length > 0 && <ItemSection
               title={t('dailyHabitsTitle')}
               items={dailyHabits}
               emptyMessage={t('noHabitsDueTodayMessage')}
               isTask={false}
               viewLink="/habits"
               addNewItem={() => setModalConfig({ isOpen: true, isTask: false })}
-            />
+            />}
 
-            <div className="space-y-2">
+            {sortedWishlistItems.length > 0 && <div className="space-y-2">
               <div className="flex items-center justify-between mb-2">
                 <h3 className="font-semibold">{t('wishlistGoalsTitle')}</h3>
                 <Badge variant="secondary">
@@ -538,6 +538,10 @@ export default function DailyOverview({
                 </div>
               </div>
             </div>
+            }
+            {dailyHabits.length === 0 && dailyTasks.length === 0 && sortedWishlistItems.length === 0 && <>
+              {t("emptyAll")}
+            </>}
           </div>
         </CardContent>
       </Card>
diff --git a/messages/ca.json b/messages/ca.json
index a4b0272..b211945 100644
--- a/messages/ca.json
+++ b/messages/ca.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Elimina hàbit",
     "confirmDeleteDialogMessage": "Estàs segur que vols eliminar \"{name}\"? Aquesta acció no es pot desfer.",
     "deleteButton": "Elimina",
-    "overdueTooltip": "Vençut"
+    "overdueTooltip": "Vençut",
+    "emptyAll": "Res a fer."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Inicia Pomodoro",
diff --git a/messages/de.json b/messages/de.json
index 6866373..8d3835d 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Gewohnheit löschen",
     "confirmDeleteDialogMessage": "Sind Sie sicher, dass Sie \"{name}\" löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
     "deleteButton": "Löschen",
-    "overdueTooltip": "Überfällig"
+    "overdueTooltip": "Überfällig",
+    "emptyAll": "Nichts zu tun."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Pomodoro starten",
diff --git a/messages/en.json b/messages/en.json
index 4925486..2379fff 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Delete Habit",
     "confirmDeleteDialogMessage": "Are you sure you want to delete \"{name}\"? This action cannot be undone.",
     "deleteButton": "Delete",
-    "overdueTooltip": "Overdue"
+    "overdueTooltip": "Overdue",
+    "emptyAll": "Nothing to do."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Start Pomodoro",
diff --git a/messages/es.json b/messages/es.json
index d0929e2..ca48131 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Eliminar hábito",
     "confirmDeleteDialogMessage": "¿Estás seguro de que quieres eliminar \"{name}\"? Esta acción no se puede deshacer.",
     "deleteButton": "Eliminar",
-    "overdueTooltip": "Vencido"
+    "overdueTooltip": "Vencido",
+    "emptyAll": "Nada que hacer."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Iniciar Pomodoro",
diff --git a/messages/fr.json b/messages/fr.json
index ff7b80a..1719edf 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Supprimer l'habitude",
     "confirmDeleteDialogMessage": "Êtes-vous sûr de vouloir supprimer \"{name}\" ? Cette action est irréversible.",
     "deleteButton": "Supprimer",
-    "overdueTooltip": "En retard"
+    "overdueTooltip": "En retard",
+    "emptyAll": "Rien à faire."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Démarrer Pomodoro",
diff --git a/messages/ja.json b/messages/ja.json
index 1ae7913..309ae9f 100644
--- a/messages/ja.json
+++ b/messages/ja.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "習慣を削除",
     "confirmDeleteDialogMessage": "\"{name}\"を削除してもよろしいですか？この操作は元に戻せません。",
     "deleteButton": "削除",
-    "overdueTooltip": "期限超過"
+    "overdueTooltip": "期限超過",
+    "emptyAll": "何もする事はありません。"
   },
   "HabitContextMenuItems": {
     "startPomodoro": "ポモドーロを開始",
diff --git a/messages/ko.json b/messages/ko.json
index 6aaf7f6..0247149 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "습관 삭제",
     "confirmDeleteDialogMessage": "정말로 \"{name}\"을(를) 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
     "deleteButton": "삭제",
-    "overdueTooltip": "기한이 지남"
+    "overdueTooltip": "기한이 지남",
+    "emptyAll": "할 일이 없어요."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "뽀모도로 시작",
diff --git a/messages/ru.json b/messages/ru.json
index ad86487..bbbdae5 100644
--- a/messages/ru.json
+++ b/messages/ru.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "Удалить привычку",
     "confirmDeleteDialogMessage": "Вы уверены, что хотите удалить \"{name}\"? Это действие нельзя отменить.",
     "deleteButton": "Удалить",
-    "overdueTooltip": "Просрочено"
+    "overdueTooltip": "Просрочено",
+    "emptyAll": "Делать нечего."
   },
   "HabitContextMenuItems": {
     "startPomodoro": "Начать помидорку",
diff --git a/messages/zh.json b/messages/zh.json
index 389525b..7bf9ccd 100644
--- a/messages/zh.json
+++ b/messages/zh.json
@@ -48,7 +48,8 @@
     "deleteHabitDialogTitle": "删除习惯",
     "confirmDeleteDialogMessage": "确定要删除\"{name}\"吗？此操作无法撤消。",
     "deleteButton": "删除",
-    "overdueTooltip": "逾期"
+    "overdueTooltip": "逾期",
+    "emptyAll": "无事可做。"
   },
   "HabitContextMenuItems": {
     "startPomodoro": "开始番茄钟",