diff --git a/src/message.ts b/src/message.ts
index a622c90c1d3f7645b369154a1a8c5545b7a0aa65..ee8fae168319eb7026d5d813720fa8c6d061b62c 100644
--- a/src/message.ts
+++ b/src/message.ts
@@ -150,8 +150,8 @@ export class Message implements Sayable {
     return '{' + this.type() + '}' + content
   }
 
-  public from(contact?: Contact): void
-  public from(id?: string): void
+  public from(contact: Contact): void
+  public from(id: string): void
   public from(): Contact
   public from(contact?: Contact|string): Contact|void {
     if (contact) {
@@ -212,10 +212,10 @@ export class Message implements Sayable {
       }
       return
     }
-    if (!this.obj.room) {
-      return null
+    if (this.obj.room) {
+      return Room.load(this.obj.room)
     }
-    return Room.load(this.obj.room)
+    return null
   }
 
   public content(content?: string): string {