1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index a8c72cdf9..46d036419 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -638,8 +638,10 @@ public class Account extends AbstractEntity {
         return this.avatar;
     }
 
-    public void activateGracePeriod(long duration) {
-        this.mEndGracePeriod = SystemClock.elapsedRealtime() + duration;
+    public void activateGracePeriod(final long duration) {
+        if (duration > 0) {
+            this.mEndGracePeriod = SystemClock.elapsedRealtime() + duration;
+        }
     }
 
     public void deactivateGracePeriod() {