diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/objectives/NpcsPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/objectives/NpcsPrompt.java
index 970a883aa..53128aa7c 100644
--- a/main/src/main/java/me/blackvein/quests/convo/quests/objectives/NpcsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/quests/objectives/NpcsPrompt.java
@@ -511,13 +511,15 @@ public class NpcsPrompt extends QuestsEditorNumericPrompt {
                         return new NpcsIdsToTalkToPrompt(context);
                     }
                 }
-                final Set<UUID> temp = plugin.getQuestFactory().getSelectingNpcs();
-                temp.remove(((Player) context.getForWhom()).getUniqueId());
-                plugin.getQuestFactory().setSelectingNpcs(temp);
                 context.setSessionData(pref + CK.S_NPCS_TO_TALK_TO, npcs);
             } else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) {
                 context.setSessionData(pref + CK.S_NPCS_TO_TALK_TO, null);
             }
+            if (context.getForWhom() instanceof Player) {
+                final Set<UUID> temp = plugin.getQuestFactory().getSelectingNpcs();
+                temp.remove(((Player) context.getForWhom()).getUniqueId());
+                plugin.getQuestFactory().setSelectingNpcs(temp);
+            }
             return new StageMainPrompt(stageNum, context);
         }
     }