diff --git a/server/game.js b/server/game.js
index 525b0e7..29e6a67 100644
--- a/server/game.js
+++ b/server/game.js
@@ -31,9 +31,7 @@ function createConnectionListener(avocadoServer) {
     // Create and track a new entity for the connection.
     const entity = createEntityForConnection();
     entityList.addEntity(entity);
-    entity.addTrait('informed');
     entity.socket = socket;
-    socket.entity = entity;
     // Listen for events.
     socket.on('message', createMessageListener(avocadoServer, socket));
     socket.on('disconnect', createDisconnectionListener(avocadoServer, socket));
@@ -84,6 +82,7 @@ function createEntityForConnection() {
       },
       existent: {},
       graphical: {},
+      informed: {},
       mobile: {
         state: {
           speed: 400,
diff --git a/traits/informed.js b/traits/informed.js
index fde7fb7..bb3ef38 100644
--- a/traits/informed.js
+++ b/traits/informed.js
@@ -71,6 +71,7 @@ class InformedBase extends Trait {
   }
 
   set socket(socket) {
+    socket.entity = this.entity;
     this._socket = socket;
   }