diff --git a/spring-mvc-java/src/main/java/org/baeldung/web/controller/ChatController.java b/spring-mvc-java/src/main/java/org/baeldung/web/controller/ChatController.java
index 0570636752..5dcbe77cd5 100644
--- a/spring-mvc-java/src/main/java/org/baeldung/web/controller/ChatController.java
+++ b/spring-mvc-java/src/main/java/org/baeldung/web/controller/ChatController.java
@@ -8,19 +8,12 @@ import org.baeldung.model.OutputMessage;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
 public class ChatController {
 
-	@RequestMapping(value = "/showChat", method = RequestMethod.GET)
-	public String displayChat() {
-		return "chat";
-	}
-
 	@MessageMapping("/chat")
-	@SendTo("/topic/")
+	@SendTo("/topic/messages")
 	public OutputMessage send(final Message message) throws Exception {
 
 		final String time = new SimpleDateFormat("HH:mm").format(new Date());
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/chat.jsp b/spring-mvc-java/src/main/webapp/resources/chat.html
similarity index 86%
rename from spring-mvc-java/src/main/webapp/WEB-INF/view/chat.jsp
rename to spring-mvc-java/src/main/webapp/resources/chat.html
index 1d0d13e211..5704ac7b58 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/view/chat.jsp
+++ b/spring-mvc-java/src/main/webapp/resources/chat.html
@@ -1,84 +1,81 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<html>
-	<head>
-	    <title>Chat WebSocket</title>
-	    
-	    <spring:url value="/resources/js/sockjs-0.3.4.js" var="sockjs" />
-	    <spring:url value="/resources/js/stomp.js" var="stomp" />
-	    
-	    <script src="${sockjs}"></script>
-	    <script src="${stomp}"></script>
-	    
-	    <script type="text/javascript">
-	    
-	        var stompClient = null;
-	        
-	        function setConnected(connected) {
-	        	
-	            document.getElementById('connect').disabled = connected;
-	            document.getElementById('disconnect').disabled = !connected;
-	            document.getElementById('conversationDiv').style.visibility = connected ? 'visible' : 'hidden';
-	            document.getElementById('response').innerHTML = '';
-	        }
-	        
-	        function connect() {
-	        	
-	            var socket = new SockJS('/spring-mvc-java/chat');
-	            stompClient = Stomp.over(socket);  
-	            
-	            stompClient.connect({}, function(frame) {
-	                
-	            	setConnected(true);
-	                console.log('Connected: ' + frame);
-	                stompClient.subscribe('/topic/message', function(messageOutput) {
-	                    showMessageOutput(JSON.parse(messageOutput.body));
-	                });
-	            });
-	        }
-	        
-	        function disconnect() {
-	        	
-	            if(stompClient != null) {
-	                stompClient.disconnect();
-	            }
-	            
-	            setConnected(false);
-	            console.log("Disconnected");
-	        }
-	        
-	        function sendMessage() {
-	        	
-	            var text = document.getElementById('text').value;
-	            stompClient.send("/app/chat", {}, JSON.stringify({ 'text': text }));
-	        }
-	        
-	        function showMessageOutput(messageOutput) {
-	        	
-	            var response = document.getElementById('response');
-	            var p = document.createElement('p');
-	            p.style.wordWrap = 'break-word';
-	            p.appendChild(document.createTextNode(messageOutput.time + ": " + messageOutput.text));
-	            response.appendChild(p);
-	        }
-	        
-	    </script>
-	    
-	</head>
-	
-	<body onload="disconnect()">
-
-		<div>
-		    <div>
-		        <button id="connect" onclick="connect();">Connect</button>
-		        <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-		    </div>
-		    <br />
-		    <div id="conversationDiv">
-		        <input type="text" id="text" placeholder="Write a message..."/>
-		        <button id="sendMessage" onclick="sendMessage();">Send</button>
-		        <p id="response"></p>
-		    </div>
-		</div>
-
-	</body>
+<html>
+	<head>
+	    <title>Chat WebSocket</title>
+	    
+	    <script src="./js/sockjs-0.3.4.js"></script>
+	    <script src="./js/stomp.js"></script>
+	    
+	    <script type="text/javascript">
+	    
+	        var stompClient = null;
+	        
+	        function setConnected(connected) {
+	        	
+	            document.getElementById('connect').disabled = connected;
+	            document.getElementById('disconnect').disabled = !connected;
+	            document.getElementById('conversationDiv').style.visibility = connected ? 'visible' : 'hidden';
+	            document.getElementById('response').innerHTML = '';
+	        }
+	        
+	        function connect() {
+	        	
+	            var socket = new SockJS('/spring-mvc-java/chat');
+	            stompClient = Stomp.over(socket);  
+	            
+	            stompClient.connect({}, function(frame) {
+	                
+	            	setConnected(true);
+	                console.log('Connected: ' + frame);
+	                stompClient.subscribe('/topic/messages', function(messageOutput) {
+	                	
+	                    showMessageOutput(JSON.parse(messageOutput.body));
+	                });
+	            });
+	        }
+	        
+	        function disconnect() {
+	        	
+	            if(stompClient != null) {
+	                stompClient.disconnect();
+	            }
+	            
+	            setConnected(false);
+	            console.log("Disconnected");
+	        }
+	        
+	        function sendMessage() {
+	        	
+	            var text = document.getElementById('text').value;
+	            stompClient.send("/app/chat", {}, JSON.stringify({ 'text': text }));
+	        }
+	        
+	        function showMessageOutput(messageOutput) {
+	        	
+	            var response = document.getElementById('response');
+	            var p = document.createElement('p');
+	            p.style.wordWrap = 'break-word';
+	            p.appendChild(document.createTextNode(messageOutput.time + ": " + messageOutput.text));
+	            response.appendChild(p);
+	        }
+	        
+	    </script>
+	    
+	</head>
+	
+	<body onload="disconnect()">
+
+		<div>
+		    <div>
+		        <button id="connect" onclick="connect();">Connect</button>
+		        <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		    </div>
+		    <br />
+		    <div id="conversationDiv">
+		        <input type="text" id="text" placeholder="Write a message..."/>
+		        <button id="sendMessage" onclick="sendMessage();">Send</button>
+		        <p id="response"></p>
+		    </div>
+		</div>
+
+	</body>
 </html>
\ No newline at end of file
