1 files changed, 2 insertions(+), 1 deletions(-)

M 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;