diff --git a/html/script.js b/html/script.js
index 97cc5bf..d67a057 100644
--- a/html/script.js
+++ b/html/script.js
@@ -72,6 +72,11 @@ function closeErrorPopup() {
 }
 
 function LeaveRoom(){
+  if (chatRoom.innerHTML.includes("Chatroom")) {
+    var roomName = chatRoom.innerHTML.split(" : ")[1];
+    var username = usernameInput.value;
+    socket.emit('leave', roomName, username);
+  }
   // Show access port to join another chat room.
   document.getElementById('AccessPort').style.display = 'block';
 
diff --git a/index.js b/index.js
index 42b36ca..aa18924 100644
--- a/index.js
+++ b/index.js
@@ -36,4 +36,11 @@ io.on('connection', function(socket){
   socket.on("recieve", function(message){
     socket.emit("recieve", message);
   })
+
+  socket.on("leave", function(room, username){
+    if (room && username) {
+      socket.leave(room);
+      io.in(room).emit("recieve", "Server : " + username + " has left the chat.");
+    }
+  });
 })