diff --git a/app/server/bot/events/index.js b/app/server/bot/events/index.js
index e7ffeda..3fa814f 100644
--- a/app/server/bot/events/index.js
+++ b/app/server/bot/events/index.js
@@ -143,13 +143,14 @@ module.exports = function(socket) {
   });
 
   bot.on('end', function() {
-    socket.emit('buffer:error', 'Connection lost...');
     socket.emit('bot:disconnect');
+    socket.mcbot = null;
   });
 
   bot.on('kick', function(reason) {
     console.log(reason);
     socket.emit('buffer:error', 'Kicked for: ' + reason);
+    socket.mcbot = null;
   });
 
 };
\ No newline at end of file