diff --git a/app/models/ticket/escalation.rb b/app/models/ticket/escalation.rb
index 3fda59253..912dc0519 100644
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@@ -108,7 +108,7 @@ returns
         self.update_time_escal_date = biz.time(pending_time, :minutes).after(update_time_escal_date)
       end
     end
-    if (!escalation_time && update_time_escal_date) || update_time_escal_date < escalation_time
+    if update_time_escal_date && ((!escalation_time && update_time_escal_date) || update_time_escal_date < escalation_time)
       self.escalation_time = update_time_escal_date
     end
 
@@ -136,7 +136,7 @@ returns
     if close_time
       self.close_time_in_min = pending_minutes(created_at, close_time, biz, 'business_minutes')
     else
-      if (!escalation_time && close_time_escal_date) || close_time_escal_date < escalation_time
+      if close_time_escal_date && ((!escalation_time && close_time_escal_date) || close_time_escal_date < escalation_time)
         self.escalation_time = close_time_escal_date
       end
     end