diff --git a/app/src/main/java/ch/nuth/zhaw/exbox/ExBoxFrame.java b/app/src/main/java/ch/nuth/zhaw/exbox/ExBoxFrame.java
index f0fc22c..decfd64 100644
--- a/app/src/main/java/ch/nuth/zhaw/exbox/ExBoxFrame.java
+++ b/app/src/main/java/ch/nuth/zhaw/exbox/ExBoxFrame.java
@@ -186,10 +186,6 @@ public class ExBoxFrame extends JFrame implements ActionListener, ItemListener {
 	}
 
 	private void execute(String args) throws Exception {
-		if (lastServer != null) {
-			command = ServerFactory.createServer(lastServer);
-		}
-
 		if (!arguments.getText().equals(history.getItemAt(0))
 				&& !arguments.getText().equals(history.getSelectedItem())) {
 			history.insertItemAt(arguments.getText(), 0);