diff --git a/Server/server.py b/Server/server.py
index 6dc972a..ec9e794 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -256,8 +256,9 @@ class Client(messaging.ConnectionManager):
         if self.on_connect:
             self.on_connect(self)
 
-    def _got_id(self):
+    def _got_id(self, value):
         logging.info("Got copter id: {} for client {}".format(self.copter_id, self.addr))
+        self.copter_id = value
         if Client.on_first_connect:
             Client.on_first_connect(self)
 
diff --git a/messaging_lib.py b/messaging_lib.py
index c43c592..f4586c0 100644
--- a/messaging_lib.py
+++ b/messaging_lib.py
@@ -164,7 +164,7 @@ class ConnectionManager(object):
         self._request_lock = threading.Lock()
 
         self.BUFFER_SIZE = 1024
-        self.resume_queue = True
+        self.resume_queue = False
 
     def _set_selector_events_mask(self, mode):
         """Set selector to listen for events: mode is 'r', 'w', 'rw'."""