diff --git a/event/listeners/message.js b/event/listeners/message.js
index 2f3e20a5..7cb7521a 100644
--- a/event/listeners/message.js
+++ b/event/listeners/message.js
@@ -14,7 +14,14 @@ class messageListener extends Listener {
 		});
 	}
 
-	async exec(message) {		
+	async exec(message) {	
+		if (message.partial) {
+			await message.fetch()
+				.catch(() => {
+					return;
+				});
+		}
+
 		if (message.author.bot) return;
 
 
diff --git a/event/listeners/messageReactionAdd.js b/event/listeners/messageReactionAdd.js
index b623e2f8..4fbc7a9a 100644
--- a/event/listeners/messageReactionAdd.js
+++ b/event/listeners/messageReactionAdd.js
@@ -12,6 +12,13 @@ class MessageReactionAddListener extends Listener {
 	}
 
 	async exec(reaction) {
+		if (reaction.message.partial) {
+			await reaction.message.fetch()
+				.catch(() => {
+					return;
+				});
+		}
+			
 		let starboardChannel, shameboardChannel;
 		let reactionCount = reaction.count;
 
diff --git a/event/listeners/messageReactionRemove.js b/event/listeners/messageReactionRemove.js
index 28035976..2bb01e4d 100644
--- a/event/listeners/messageReactionRemove.js
+++ b/event/listeners/messageReactionRemove.js
@@ -10,8 +10,14 @@ class messageReactionRemoveListener extends Listener {
 		});
 	}
 
-	async exec(reaction, user) {
-		if (reaction.message.author == user) return;
+	async exec(reaction) {
+		if (reaction.message.partial) {
+			await reaction.message.fetch()
+				.catch(() => {
+					return;
+				});
+		}
+
 		let starboardChannel, shameboardChannel;
 
 		//	Starboard