diff --git a/components/app.js b/components/app.js
index e55ec39..80fdb4c 100644
--- a/components/app.js
+++ b/components/app.js
@@ -872,6 +872,12 @@ export default class App extends Component {
 			store.autoconnect.put(null);
 		}
 
+		// Disconnect previous server, if any
+		let activeBuffer = this.state.buffers.get(this.state.activeBuffer);
+		if (activeBuffer) {
+			this.close(activeBuffer.server);
+		}
+
 		this.connect(connectParams);
 	}