1 files changed, 5 insertions, 0 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 5a288ed..c85fcf5 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -10,6 +10,11 @@ module ContentHelper
   
   def calendar
     occurrences = Occurrence.find_in_range(Time.now, (Time.now+14.days))
+    
+    if occurrences.empty?
+      occurrences = Occurrence.find_next
+    end
+    
     render(
       :partial  => 'content/front_page_calendar', 
       :locals   => {:occurrences => occurrences}