diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 65721ee1fe64d70a0ede127df53b27e4352a26cf..8b06fbeea9ef57681c5258f3ee372975b228ffd7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2654,8 +2654,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             }
 
             protected void updateWithResponseUiThread(final IqPacket iq) {
-                this.loadingTimer.cancel();
+                Timer oldTimer = this.loadingTimer;
                 this.loadingTimer = new Timer();
+                oldTimer.cancel();
                 this.executing = false;
                 this.loading = false;
                 this.loadingHasBeenLong = false;