diff --git a/rogue_pop.asl b/rogue_pop.asl
index 9a1b965..d89b0b6 100644
--- a/rogue_pop.asl
+++ b/rogue_pop.asl
@@ -147,6 +147,18 @@ start
     return vars.is_fresh_file_mode || oasis_start;
 }
 
+reset
+{
+    if (vars.is_fresh_file_mode) {
+        return false;
+    } else {
+        return
+            settings["oasis_reset"] &&
+            old.activeScene != vars.OASIS_SCENE &&
+            current.activeScene == vars.OASIS_SCENE;
+    }
+}
+
 onStart
 {
     vars.just_exited_oasis = false;
diff --git a/settings/RoguePoP.Settings.xml b/settings/RoguePoP.Settings.xml
index 1ccefa5..2219e78 100644
--- a/settings/RoguePoP.Settings.xml
+++ b/settings/RoguePoP.Settings.xml
@@ -6,4 +6,5 @@
         <Setting Id="nogai_one" Label="Nogai, the Indomitable" State="true" />
         <Setting Id="final_split" Label="Nogai, the Broken" State="true" />
     </Setting>
+    <Setting Id="oasis_reset" Label="Automatic reset for runs that begin from Oasis" State="true" />
 </Settings>