diff --git a/src/message.js b/src/message.js
index 796c8dc5f..b3b7e6680 100644
--- a/src/message.js
+++ b/src/message.js
@@ -23,7 +23,7 @@ class Message {
 		if (this.isPrivate) {
 			this.author = this.channel.client.getUser("id", author.id);
 		} else {
-			this.author = this.channel.server.getMember("id", author.id) || this.channel.client.getUser("id", author.id);
+			this.author = this.channel.server ? this.channel.server.getMember("id", author.id) : this.channel.client.getUser("id", author.id);
 		}
 
 		this.attachments = data.attachments;