diff --git a/src/d2m/converters/message-to-event.js b/src/d2m/converters/message-to-event.js
index e00e5c3..86b310c 100644
--- a/src/d2m/converters/message-to-event.js
+++ b/src/d2m/converters/message-to-event.js
@@ -785,9 +785,9 @@ async function messageToEvent(message, guild, options = {}, di) {
 	// Send Klipy GIFs in customised form
 	let isKlipyGIF = false
 	let isOnlyKlipyGIF = false
-	if (message.content && message.embeds?.length === 1 && message.embeds[0].provider?.name === "Klipy" && message.embeds[0].video?.url) {
+	if (message.embeds?.length === 1 && message.embeds[0].provider?.name === "Klipy" && message.embeds[0].video?.url) {
 		isKlipyGIF = true
-		if (message.content.match(/^https?:\/\/klipy\.com[^ \n]+$/)) {
+		if (message.content?.match(/^https?:\/\/klipy\.com[^ \n]+$/)) {
 			isOnlyKlipyGIF = true
 		}
 	}