diff --git a/src/main/webapp/WEB-INF/spring/spring-websocket.xml b/src/main/webapp/WEB-INF/spring/spring-websocket.xml
deleted file mode 100644
index 2d86bc8502cbf37af04b2112f5c851f6f3c4fea6..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/spring/spring-websocket.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:websocket="http://www.springframework.org/schema/websocket"
-	xsi:schemaLocation="http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<websocket:handlers>
-		<websocket:mapping handler="echoHandler" path="/socket/echo"/>
-	</websocket:handlers>
-	
-	<bean id="echoHandler" class="de.thm.arsnova.socket.EchoHandler" />
-</beans>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8798a75df6eccae31b54f131c5845af8228791d4..75b4f85dfa2d9be9d897517d4ce23c473a78bce5 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,6 @@
 			<param-name>contextConfigLocation</param-name>
 			<param-value>
 				/WEB-INF/spring/arsnova-servlet.xml
-				/WEB-INF/spring/spring-websocket.xml
 			</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>