diff --git a/ts/smartuniverse.classes.universe.ts b/ts/smartuniverse.classes.universe.ts
index 01204e8..e6bea5e 100644
--- a/ts/smartuniverse.classes.universe.ts
+++ b/ts/smartuniverse.classes.universe.ts
@@ -140,7 +140,7 @@ export class Universe {
             this.universeCache,
             unauthenticatedMessage
           );
-          if (foundChannel) {
+          if (foundChannel && unauthenticatedMessage.authenticated) {
             const authenticatedMessage = unauthenticatedMessage;
             await this.universeCache.addMessage(authenticatedMessage);
           }
diff --git a/ts/smartuniverse.classes.universemessage.ts b/ts/smartuniverse.classes.universemessage.ts
index d6d81c7..8b621f2 100644
--- a/ts/smartuniverse.classes.universemessage.ts
+++ b/ts/smartuniverse.classes.universemessage.ts
@@ -42,7 +42,7 @@ export class UniverseMessage implements interfaces.IUniverseMessage {
   /**
    * wether the message is authenticated
    */
-  public authenticated: boolean = null;
+  public authenticated: boolean = false;
 
   /**
    * a destruction timer for this message