diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 747641b04..344e9e031 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -329,15 +329,31 @@ def aggregate_template_usage(template_statistics, sort_key="count"):
         templates.append(
             {
                 "template_id": k,
-                "template_name": template_stats[0]["template_name"],
-                "template_type": template_stats[0]["template_type"],
+                "template_name": (
+                    template_stats[0].get("template_name") if template_stats else None
+                ),
+                "template_type": (
+                    template_stats[0].get("template_type") if template_stats else None
+                ),
                 "count": sum(s["count"] for s in template_stats),
-                "last_used": max(s["last_used"] for s in template_stats if s["last_used"]),
-                "created_by": template_stats[0]["created_by"],
-                "created_by_id": template_stats[0]["created_by_id"],
-                "status": template_stats[0]["status"],
-                "template_folder": template_stats[0]["template_folder"],
-                "template_folder_id": template_stats[0]["template_folder_id"],
+                "created_by": (
+                    template_stats[0].get("created_by") if template_stats else None
+                ),
+                "created_by_id": (
+                    template_stats[0].get("created_by_id") if template_stats else None
+                ),
+                "last_used": (
+                    template_stats[0].get("last_used") if template_stats else None
+                ),
+                "status": template_stats[0].get("status") if template_stats else None,
+                "template_folder": (
+                    template_stats[0].get("template_folder") if template_stats else None
+                ),
+                "template_folder_id": (
+                    template_stats[0].get("template_folder_id")
+                    if template_stats
+                    else None
+                ),
             }
         )
 
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index e2a7a6b58..5e04c8b7e 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -133,6 +133,11 @@ stub_template_stats = [
         "template_id": "id-1",
         "status": "created",
         "count": 50,
+        "last_used": "2024-01-25T23:02:25+00:00",
+        "created_by": "Test user",
+        "created_by_id": "987654",
+        "template_folder": "Some_folder",
+        "template_folder_id": "123456",
     },
     {
         "template_type": "email",
@@ -140,6 +145,11 @@ stub_template_stats = [
         "template_id": "id-2",
         "status": "created",
         "count": 100,
+        "last_used": "2024-01-25T23:02:25+00:00",
+        "created_by": "Test user",
+        "created_by_id": "987654",
+        "template_folder": "Some_folder",
+        "template_folder_id": "123456",
     },
     {
         "template_type": "email",
@@ -147,6 +157,11 @@ stub_template_stats = [
         "template_id": "id-2",
         "status": "technical-failure",
         "count": 100,
+        "last_used": "2024-01-25T23:02:25+00:00",
+        "created_by": "Test user",
+        "created_by_id": "987654",
+        "template_folder": "Some_folder",
+        "template_folder_id": "123456",
     },
     {
         "template_type": "sms",
@@ -154,6 +169,11 @@ stub_template_stats = [
         "template_id": "id-1",
         "status": "delivered",
         "count": 50,
+        "last_used": "2024-01-25T23:02:25+00:00",
+        "created_by": "Test user",
+        "created_by_id": "987654",
+        "template_folder": "Some_folder",
+        "template_folder_id": "123456",
     },
 ]