diff --git a/test/common/ops/rebirth.js b/test/common/ops/rebirth.js
index d82c8adcb8..0d4902b567 100644
--- a/test/common/ops/rebirth.js
+++ b/test/common/ops/rebirth.js
@@ -172,13 +172,13 @@ describe('shared.ops.rebirth', () => {
     expect(user.flags.levelDrops).to.be.empty;
   });
 
-  it('does not reset rebirthEnabled if user has beastMaster', () => {
+  it('reset rebirthEnabled even if user has beastMaster', () => {
     user.achievements.beastMaster = 1;
     user.flags.rebirthEnabled = true;
 
     rebirth(user);
 
-    expect(user.flags.rebirthEnabled).to.be.true;
+    expect(user.flags.rebirthEnabled).to.be.false;
   });
 
   it('sets rebirth achievement', () => {
diff --git a/website/common/script/ops/rebirth.js b/website/common/script/ops/rebirth.js
index 07da3d3e85..7531de25a6 100644
--- a/website/common/script/ops/rebirth.js
+++ b/website/common/script/ops/rebirth.js
@@ -81,12 +81,10 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) {
   }
 
   let flags = user.flags;
-  if (!user.achievements.beastMaster) {
-    flags.rebirthEnabled = false;
-  }
   flags.itemsEnabled = false;
   flags.dropsEnabled = false;
   flags.classSelected = false;
+  flags.rebirthEnabled = false;
   flags.levelDrops = {};
 
   if (!user.achievements.rebirths) {