diff --git a/src/main/java/info/istlab/ServerTester/Host.java b/src/main/java/info/istlab/ServerTester/Host.java
index 367f4da..c0cd41c 100644
--- a/src/main/java/info/istlab/ServerTester/Host.java
+++ b/src/main/java/info/istlab/ServerTester/Host.java
@@ -30,7 +30,6 @@
         addPanel.setBorder(BorderFactory.createTitledBorder("Start New Server (Class, Port, Bind address)"));
         add(addPanel, BorderLayout.NORTH);
         mainhost = this;
-
         // udpServer = new UDPServer();
     }
 
diff --git a/src/main/java/info/istlab/ServerTester/ServerPanel.java b/src/main/java/info/istlab/ServerTester/ServerPanel.java
index fb41a3b..0635e49 100644
--- a/src/main/java/info/istlab/ServerTester/ServerPanel.java
+++ b/src/main/java/info/istlab/ServerTester/ServerPanel.java
@@ -27,6 +27,7 @@
     JButton delButton;
     JButton clientButton;
 
+    boolean isDeleted = false;
     /**
      * Create the panel.
      */
@@ -65,6 +66,7 @@
         delButton.addActionListener(e -> {
             server.close();
             Host.mainhost.mainPanel.remove(this);
+            isDeleted = true;
             Host.mainhost.pack();
         });
         add(delButton);
@@ -155,6 +157,9 @@
     }
 
     public String getAvailableServices() {
+        if (isDeleted) {
+            return "";
+        }
         if (server.thread != null) {
             return name + " " + server.getExpectedPort() + " " + server.getExpectedAddress() + " Running";
         } else {