diff --git a/src/data/GuildSavedMessages.ts b/src/data/GuildSavedMessages.ts
index 4419f111..fc331b7f 100644
--- a/src/data/GuildSavedMessages.ts
+++ b/src/data/GuildSavedMessages.ts
@@ -83,6 +83,7 @@ export class GuildSavedMessages extends BaseRepository {
       .where("guild_id = :guild_id", { guild_id: this.guildId })
       .andWhere("channel_id = :channel_id", { channel_id: channelId })
       .andWhere("is_bot = 1")
+      .andWhere("deleted_at IS NULL")
       .orderBy("id", "DESC")
       .limit(limit)
       .getMany();
@@ -94,6 +95,7 @@ export class GuildSavedMessages extends BaseRepository {
       .where("guild_id = :guild_id", { guild_id: this.guildId })
       .andWhere("channel_id = :channel_id", { channel_id: channelId })
       .andWhere("id < :beforeId", { beforeId })
+      .andWhere("deleted_at IS NULL")
       .orderBy("id", "DESC")
       .limit(limit)
       .getMany();
@@ -105,6 +107,7 @@ export class GuildSavedMessages extends BaseRepository {
       .where("guild_id = :guild_id", { guild_id: this.guildId })
       .andWhere("channel_id = :channel_id", { channel_id: channelId })
       .andWhere("user_id = :user_id", { user_id: userId })
+      .andWhere("deleted_at IS NULL")
       .orderBy("id", "DESC")
       .limit(limit)
       .getMany();
@@ -116,7 +119,8 @@ export class GuildSavedMessages extends BaseRepository {
       .where("guild_id = :guild_id", { guild_id: this.guildId })
       .andWhere("user_id = :user_id", { user_id: userId })
       .andWhere("channel_id = :channel_id", { channel_id: channelId })
-      .andWhere("id > :afterId", { afterId });
+      .andWhere("id > :afterId", { afterId })
+      .andWhere("deleted_at IS NULL");
 
     if (limit != null) {
       query = query.limit(limit);
diff --git a/src/plugins/Utility.ts b/src/plugins/Utility.ts
index b7b29e65..b934986e 100644
--- a/src/plugins/Utility.ts
+++ b/src/plugins/Utility.ts
@@ -178,7 +178,7 @@ export class UtilityPlugin extends Plugin {
     }, CLEAN_COMMAND_DELETE_DELAY);
   }
 
-  @d.command("clean user", "<userId:string> <count:number>")
+  @d.command("clean user", "<userId:userid> <count:number>")
   @d.permission("clean")
   async cleanUserCmd(msg: Message, args: { userId: string; count: number }) {
     if (args.count > MAX_CLEAN_COUNT || args.count <= 0) {