diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index d4132f35652a9f0854a31865a6791b7a9c560514..5eae72128b538c447efd708ce032dcfbffabd575 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -9,6 +9,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 
+import javax.annotation.PreDestroy;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,13 @@ public class ARSnovaSocketIOServer {
 	public ARSnovaSocketIOServer() {
 		config = new Configuration();
 	}
+	
+	@PreDestroy
+	public void closeAllSessions() {
+		for (SocketIOClient c : server.getAllClients()) {
+			c.disconnect();
+		}
+	}
 
 	public void startServer() throws Exception {
 		/**