diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 6ed9f9d3b..1072e29da 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1327,8 +1327,9 @@ public class XmppConnection implements Runnable {
 						}
 						socket.close();
 						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": closed tcp without closing stream");
+						changeStatus(Account.State.OFFLINE);
 					} catch (IOException | InterruptedException e) {
-						return;
+						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": error while closing socket for waitForPush()");
 					}
 				}
 			}).start();