diff --git a/ts/smartuniverse.classes.universe.ts b/ts/smartuniverse.classes.universe.ts
index 535220e..01204e8 100644
--- a/ts/smartuniverse.classes.universe.ts
+++ b/ts/smartuniverse.classes.universe.ts
@@ -135,10 +135,15 @@ export class Universe {
               universeConnectionInstance
             );
           }
-          await UniverseChannel.authorizeAMessageForAChannel(
+          const unauthenticatedMessage = UniverseMessage.createMessageFromPayload(dataArg);
+          const foundChannel = await UniverseChannel.authorizeAMessageForAChannel(
             this.universeCache,
-            UniverseMessage.createMessageFromPayload(dataArg)
+            unauthenticatedMessage
           );
+          if (foundChannel) {
+            const authenticatedMessage = unauthenticatedMessage;
+            await this.universeCache.addMessage(authenticatedMessage);
+          }
         })();
       }
     });
diff --git a/ts/smartuniverse.classes.universechannel.ts b/ts/smartuniverse.classes.universechannel.ts
index afc256b..98e3e35 100644
--- a/ts/smartuniverse.classes.universechannel.ts
+++ b/ts/smartuniverse.classes.universechannel.ts
@@ -50,7 +50,7 @@ export class UniverseChannel {
   public static authorizeAMessageForAChannel(
     universeCacheArg: UniverseCache,
     universeMessageArg: UniverseMessage
-  ) {
+  ): UniverseChannel {
     const foundChannel = universeCacheArg.channelMap.find(universeChannel => {
       const result = universeChannel.authenticate(universeMessageArg);
       return result;
@@ -58,11 +58,13 @@ export class UniverseChannel {
     if (foundChannel) {
       universeMessageArg.authenticated = true;
       universeMessageArg.universeChannelList.add(foundChannel);
+      console.log('message authorized');
       return foundChannel;
     } else {
       universeMessageArg.authenticated = false;
       universeMessageArg.universeChannelList.add(universeCacheArg.blackListChannel);
       console.log('message not valid');
+      return null;
     }
   }