diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 9aa3c0b72..0e98586b7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -604,8 +604,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() {