diff --git a/src/actions/tickets/delete.ts b/src/actions/tickets/delete.ts
index 3419763..e5c017f 100644
--- a/src/actions/tickets/delete.ts
+++ b/src/actions/tickets/delete.ts
@@ -7,8 +7,9 @@
     const { log, NucleusColors, entry, renderUser, renderChannel, renderDelta } = client.logger;
 
     const config = await client.database.guilds.read(interaction.guild.id);
-    let thread = false; let threadChannel;
-    if (interaction.channel instanceof Discord.ThreadChannel) thread = true; threadChannel = interaction.channel as Discord.ThreadChannel;
+    let thread = false;
+    if (interaction.channel instanceof Discord.ThreadChannel) thread = true;
+    const threadChannel = interaction.channel as Discord.ThreadChannel;
     const channel = (interaction.channel as Discord.TextChannel);
     if (!channel.parent || config.tickets.category !== channel.parent.id || (thread ? (threadChannel.parent.parent.id !== config.tickets.category) : false)) {
         return interaction.reply({embeds: [new EmojiEmbed()
