diff --git a/src/main/java/info/istlab/ServerTester/AddPanel.java b/src/main/java/info/istlab/ServerTester/AddPanel.java
index de809a4..1a3e3d2 100644
--- a/src/main/java/info/istlab/ServerTester/AddPanel.java
+++ b/src/main/java/info/istlab/ServerTester/AddPanel.java
@@ -27,7 +27,7 @@
 
         String[] options = { "WebServer", "TimeServer", "ThreadTimeServer", "EchoServer", "ThreadEchoServer",
                 "WhiteBoardServer", "SimpleWebSocketServer" };
-        int[] defaultPorts = { 8081, 10123, 11123, 10008, 11008, 11111, 8887 };
+        int[] defaultPorts = { 8081, 10123, 11123, 10007, 11007, 11111, 8887 };
         servBox = new JComboBox<String>(options);
         add(servBox);
         servBox.addActionListener(e -> {
diff --git a/src/main/java/info/istlab/ServerTester/App.java b/src/main/java/info/istlab/ServerTester/App.java
index 5521146..ec5107a 100644
--- a/src/main/java/info/istlab/ServerTester/App.java
+++ b/src/main/java/info/istlab/ServerTester/App.java
@@ -66,10 +66,10 @@
             ThreadTimeServer ttime = new ThreadTimeServer(11123);
             myhost.addPanel(new ServerPanel(ttime, myhost));
 
-            EchoServer echo = new EchoServer(10008, "127.0.0.1");
+            EchoServer echo = new EchoServer(10007, "127.0.0.1");
             myhost.addPanel(new ServerPanel(echo, myhost));
 
-            ThreadEchoServer techo = new ThreadEchoServer(11008);
+            ThreadEchoServer techo = new ThreadEchoServer(11007);
             myhost.addPanel(new ServerPanel(techo, myhost));
 
             WhiteBoardServer wb = new WhiteBoardServer(11111, "0.0.0.0");
diff --git a/src/main/java/info/istlab/ServerTester/EchoServer.java b/src/main/java/info/istlab/ServerTester/EchoServer.java
index a91d1ab..c6d27c0 100644
--- a/src/main/java/info/istlab/ServerTester/EchoServer.java
+++ b/src/main/java/info/istlab/ServerTester/EchoServer.java
@@ -9,7 +9,7 @@
 public class EchoServer extends Server {
 
 	public EchoServer() {
-		this(10008);
+		this(10007);
 	}
 
 	public EchoServer(int port) {
@@ -17,7 +17,7 @@
 	}
 
 	public EchoServer(String bindaddress) {
-		this(10008, bindaddress);
+		this(10007, bindaddress);
 	}
 
 	public EchoServer(int port, String bindaddress) {
diff --git a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java
index bd57e55..6d9c61c 100644
--- a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java
+++ b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java
@@ -9,14 +9,14 @@
 
 public class ThreadEchoServer extends Server {
 	public ThreadEchoServer() {
-		this(11008);
+		this(11007);
 	}
 
 	public ThreadEchoServer(int port) {
 		this(port, "127.0.0.1");
 	}
 	public ThreadEchoServer(String bindaddress) {
-		this(11008, bindaddress);
+		this(11007, bindaddress);
 	}
 
 	public ThreadEchoServer(int port, String bindaddress) {