diff --git a/src/main/java/io/socket/client/Socket.java b/src/main/java/io/socket/client/Socket.java
index 05feff39..9e844d94 100644
--- a/src/main/java/io/socket/client/Socket.java
+++ b/src/main/java/io/socket/client/Socket.java
@@ -376,7 +376,10 @@ private void onconnect(String id) {
     private void emitBuffered() {
         List<Object> data;
         while ((data = this.receiveBuffer.poll()) != null) {
-            String event = (String)data.get(0);
+            if (data.isEmpty()) {
+                continue;
+            }
+            String event = data.remove(0).toString();
             super.emit(event, data.toArray());
         }
         this.receiveBuffer.clear();