diff --git a/src/commands/Welcome/goodbye.js b/src/commands/Welcome/goodbye.js
index dcfd25e318..736924a5a2 100644
--- a/src/commands/Welcome/goodbye.js
+++ b/src/commands/Welcome/goodbye.js
@@ -62,7 +62,7 @@ export default {
             const ping = options.getBoolean('ping') ?? false;
 
             const existingConfig = await getWelcomeConfig(client, guild.id);
-            if (hasGoodbyeSetup(existingConfig)) {
+            if (existingConfig?.goodbyeChannelId) {
                 logger.info(`[Goodbye] Setup blocked because config already exists in channel ${existingConfig.goodbyeChannelId} for guild ${guild.id}`);
                 return await InteractionHelper.safeEditReply(interaction, {
                     embeds: [errorEmbed(
diff --git a/src/commands/Welcome/welcome.js b/src/commands/Welcome/welcome.js
index 02d864b62d..4461b0ba7e 100644
--- a/src/commands/Welcome/welcome.js
+++ b/src/commands/Welcome/welcome.js
@@ -67,7 +67,7 @@ export default {
             const ping = options.getBoolean('ping') ?? false;
 
             const existingConfig = await getWelcomeConfig(client, guild.id);
-            if (hasWelcomeSetup(existingConfig)) {
+            if (existingConfig?.channelId) {
                 logger.info(`[Welcome] Setup blocked because config already exists in channel ${existingConfig.channelId} for guild ${guild.id}`);
                 return await InteractionHelper.safeEditReply(interaction, {
                     embeds: [errorEmbed(