Remove conditional on reconnect