diff --git a/src/commands/effects.ts b/src/commands/effects.ts
index aa58d3b..bcaa929 100644
--- a/src/commands/effects.ts
+++ b/src/commands/effects.ts
@@ -33,7 +33,7 @@ export default class Effects extends Command {
     private async List(interaction: CommandInteraction) {
         const pageOption = interaction.options.get("page");
 
-        const page = pageOption && Number(pageOption.value) ? Number(pageOption.value) : 1;
+        const page = !isNaN(Number(pageOption?.value)) ? Number(pageOption?.value) : 1;
 
         const result = await EffectHelper.GenerateEffectEmbed(interaction.user.id, page);
 
diff --git a/src/helpers/EffectHelper.ts b/src/helpers/EffectHelper.ts
index 11f6ed8..d0d29a0 100644
--- a/src/helpers/EffectHelper.ts
+++ b/src/helpers/EffectHelper.ts
@@ -80,7 +80,7 @@ export default class EffectHelper {
                     .setCustomId(`effects list ${page - 1}`)
                     .setLabel("Previous")
                     .setStyle(ButtonStyle.Primary)
-                    .setDisabled(page - 1 == 0),
+                    .setDisabled(page == 1),
                 new ButtonBuilder()
                     .setCustomId(`effects list ${page + 1}`)
                     .setLabel("Next")