diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 1437c33e7..d357fd74f 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -630,8 +630,11 @@ sub getEventsIn {
                 ( 
                     Event.startTime IS NULL 
                     && Event.endTime IS NULL 
-                    && Event.startDate >= '$startDate' 
-                    && Event.startDate < '$endDate'
+                    && !
+                        (
+                            Event.startDate >= '$endDate' 
+                         || Event.endDate   <  '$startDate'
+                        )
                 ) 
                 || ( 
                     CONCAT(Event.startDate,' ',Event.startTime) >= '$startTz'