diff --git a/src/main/java/spireQuests/quests/soytheproton/MothQuest.java b/src/main/java/spireQuests/quests/soytheproton/MothQuest.java
index 50f6532d..af43efd9 100644
--- a/src/main/java/spireQuests/quests/soytheproton/MothQuest.java
+++ b/src/main/java/spireQuests/quests/soytheproton/MothQuest.java
@@ -18,7 +18,7 @@ public class MothQuest extends AbstractQuest {
     public MothQuest() {
         super(QuestType.SHORT, QuestDifficulty.HARD);
 
-        new TriggerTracker<>(QuestTriggers.ACT_CHANGE,1)
+        new TriggerTracker<>(QuestTriggers.LEAVE_ROOM,5)
                 .add(this);
         new TriggeredUpdateTracker<Integer, Integer>(QuestTriggers.UNBLOCKED_ATTACK_DAMAGE_TAKEN,
                 0, 25, Integer::sum, ()->false) {
@@ -44,7 +44,7 @@ public void makeTooltips(List<PowerTip> tipList) {
 
     @Override
     public boolean canSpawn() {
-        // This will make it so it spawns on the first five floors of Act 1 and 2, assuming no shenanigans.
-        return AbstractDungeon.floorNum <= 5 || AbstractDungeon.floorNum > 17 && AbstractDungeon.floorNum <= 23;
+        // This will make it so it won't force you to do the quest against the boss
+        return AbstractDungeon.floorNum <= 11 || AbstractDungeon.floorNum > 17 && AbstractDungeon.floorNum <= 28 || AbstractDungeon.floorNum > 33 && AbstractDungeon.floorNum <= 45;
     }
 }
diff --git a/src/main/resources/anniv8Resources/localization/eng/soytheproton/Queststrings.json b/src/main/resources/anniv8Resources/localization/eng/soytheproton/Queststrings.json
index 20812f47..fede112a 100644
--- a/src/main/resources/anniv8Resources/localization/eng/soytheproton/Queststrings.json
+++ b/src/main/resources/anniv8Resources/localization/eng/soytheproton/Queststrings.json
@@ -26,10 +26,10 @@
   },
   "${ModID}:MothQuest": {
     "TITLE": "Fluttering Friend",
-    "DESCRIPTION": "A fragile friend is following along with you. Take no more than #b25 unblocked attack damage this act.",
+    "DESCRIPTION": "A fragile friend is following along with you. Take no more than #b25 unblocked attack damage in the next 5 floors.",
     "AUTHOR": "CrypticAurora",
     "TRACKER_TEXT": [
-      "Acts completed",
+      "Floors climbed",
       "Unblocked attack damage taken"
     ],
     "EXTRA_TEXT": [