diff --git a/src/listeners/client/messageCreate.js b/src/listeners/client/messageCreate.js
index 3773228..a29c8ff 100644
--- a/src/listeners/client/messageCreate.js
+++ b/src/listeners/client/messageCreate.js
@@ -188,24 +188,23 @@ module.exports = class extends Listener {
 			if (ticket) {
 				// archive messages
 				if (settings.archive) {
-					try {
-						await client.tickets.archiver.saveMessage(ticket.id, message);
-					} catch (error) {
-						client.log.warn('Failed to archive message', message.id);
-						client.log.error(error);
-					}
+					client.tickets.archiver.saveMessage(ticket.id, message)
+						.catch(error => {
+							client.log.warn('Failed to archive message', message.id);
+							client.log.error(error);
+						});
 				}
 
 				if (!message.author.bot) {
 					// update user's message count
-					await client.prisma.user.upsert({
+					client.prisma.user.upsert({
 						create: {
 							id: message.author.id,
 							messageCount: 1,
 						},
 						update: { messageCount: { increment: 1 } },
 						where: { id: message.author.id },
-					});
+					}).catch(client.log.error);
 
 					// set first and last message timestamps
 					const data = { lastMessageAt: new Date() };
diff --git a/src/listeners/client/messageDelete.js b/src/listeners/client/messageDelete.js
index 8675f54..1065114 100644
--- a/src/listeners/client/messageDelete.js
+++ b/src/listeners/client/messageDelete.js
@@ -36,16 +36,16 @@ module.exports = class extends Listener {
 
 		if (ticket.guild.archive) {
 			try {
+				await client.prisma.archivedMessage.update({
+					data: { deleted: true },
+					where: { id: message.id },
+				});
 				const archived = await client.prisma.archivedMessage.findUnique({ where: { id: message.id } });
 				if (archived?.content) {
 					if (!content) {
 						const string = await quick('crypto', worker => worker.decrypt(archived.content));
 						content = JSON.parse(string).content; // won't be cleaned
 					}
-					await client.prisma.archivedMessage.update({
-						data: { deleted: true },
-						where: { id: message.id },
-					});
 				}
 			} catch (error) {
 				client.log.warn('Failed to "delete" archived message', message.id);