diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
index 79464722d0..659c7da3e8 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
@@ -182,7 +182,7 @@ class MeetingActor(val meetingID: String, val externalMeetingID: String, val mee
 
     println("(" + startedOn + "+" + duration + ") - " + now + " = " + ((startedOn + duration) - now) + " < 15")
 
-    if (((startedOn + duration) - now) < 15) {
+    if (duration > 0 && (((startedOn + duration) - now) < 15)) {
       log.warning("MEETING WILL END IN 15 MINUTES!!!!")
     }
   }