diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb
index f0bd5a19a..a7e94d551 100644
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@@ -48,10 +48,9 @@ returns
     if sla
       calendar = sla.calendar
     end
-    return if !calendar
 
     # if no escalation is enabled
-    if !sla
+    if !sla || !calendar
 
       # nothing to change
       return true if !escalation_time