diff --git a/schasite/templates/schasite/calendar2.html b/schasite/templates/schasite/calendar2.html
index be73f45..6aa709b 100644
--- a/schasite/templates/schasite/calendar2.html
+++ b/schasite/templates/schasite/calendar2.html
@@ -136,6 +136,12 @@
                         </div>
                     </div>
                     
+                    {% empty %}
+                    <div class="col-12">
+                        <div class="alert alert-light border text-center mb-0" role="status">
+                            There are no upcoming events to display.
+                        </div>
+                    </div>
                     {% endfor %}
                 </div>
             </div>
@@ -179,9 +185,13 @@
                                 </div>
                             </div>
                         </div>
+                    {% empty %}
+                    <div class="col-12">
+                        <div class="alert alert-light border text-center mb-0" role="status">
+                            There are no past events to display.
+                        </div>
+                    </div>
                     {% endfor %}
-                     
-                    
                 </div>
             </div>
         </div>
diff --git a/schasite/tests.py b/schasite/tests.py
index afdc331..6c48d67 100644
--- a/schasite/tests.py
+++ b/schasite/tests.py
@@ -66,6 +66,13 @@ class PublicPageTests(TestCase):
         response = self.client.get(reverse("calendar2"))
         self.assertEqual(response.status_code, 200)
 
+    def test_calendar_shows_empty_state_when_no_events(self):
+        response = self.client.get(reverse("calendar2"))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "There are no upcoming events to display.")
+        self.assertContains(response, "There are no past events to display.")
+
     def test_newsletters_renders(self):
         response = self.client.get(reverse("newsletters2"))
         self.assertEqual(response.status_code, 200)
@@ -414,6 +421,8 @@ class CalendarEventTests(TestCase):
         self.assertNotIn("Ongoing Event", past_html)
         self.assertIn("Archived Picnic", past_html)
         self.assertNotIn("Archived Picnic", upcoming_html)
+        self.assertNotIn("There are no upcoming events to display.", upcoming_html)
+        self.assertNotIn("There are no past events to display.", past_html)
 
 
 @override_settings(