diff --git a/TaskTracker.Api/Pages/Analytics.cshtml b/TaskTracker.Api/Pages/Analytics.cshtml
index d85a347..d8fd2a3 100644
--- a/TaskTracker.Api/Pages/Analytics.cshtml
+++ b/TaskTracker.Api/Pages/Analytics.cshtml
@@ -126,8 +126,19 @@
 
 @section Scripts {
 <script>
+    function showChartEmptyState(canvasId, message) {
+        var canvas = document.getElementById(canvasId);
+        var container = canvas.closest('.chart-container');
+        container.innerHTML = '<div class="search-empty">' + message + '</div>';
+        container.style.display = 'flex';
+        container.style.alignItems = 'center';
+        container.style.justifyContent = 'center';
+    }
+
     // Timeline bar chart
-    if (timelineData.length > 0) {
+    if (timelineData.length === 0) {
+        showChartEmptyState('timeline-chart', 'No activity recorded in this time range.');
+    } else {
         new Chart(document.getElementById('timeline-chart'), {
             type: 'bar',
             data: {
@@ -169,7 +180,9 @@
     }
 
     // Category donut chart
-    if (categoryData.length > 0) {
+    if (categoryData.length === 0) {
+        showChartEmptyState('category-chart', 'No categorized activity in this time range.');
+    } else {
         new Chart(document.getElementById('category-chart'), {
             type: 'doughnut',
             data: {