diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 276b74f10..64ecc2aee 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1622,6 +1622,8 @@ export default class BattleScene extends Phaser.Scene {
 
 	generateEnemyModifiers(): Promise<void> {
 		return new Promise(resolve => {
+			if (this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS)
+				return resolve();
 			const waveIndex = this.currentBattle.waveIndex;
 			const chances = Math.ceil(waveIndex / 10);
 			const isBoss = !(waveIndex % 10) || (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.trainer.config.isBoss);
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 41543c44e..14dae535e 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -23,6 +23,7 @@ import { loggedInUser, updateUserInfo } from "../account";
 import { Nature } from "../data/nature";
 import { GameStats } from "./game-stats";
 import { Tutorial } from "../tutorial";
+import { BattleSpec } from "../enums/battle-spec";
 
 const saveKey = 'x0i2O7WRiANTqPmZ'; // Temporary; secure encryption is not yet necessary
 
@@ -519,13 +520,16 @@ export class GameData {
 
           scene.updateModifiers(true);
 
-          for (let enemyModifierData of sessionData.enemyModifiers) {
-            const modifier = enemyModifierData.toModifier(scene, modifiersModule[enemyModifierData.className]);
-            if (modifier)
-              scene.addEnemyModifier(modifier, true);
-          }
+          // TODO: Remove if
+          if (battle.battleSpec !== BattleSpec.FINAL_BOSS) {
+            for (let enemyModifierData of sessionData.enemyModifiers) {
+              const modifier = enemyModifierData.toModifier(scene, modifiersModule[enemyModifierData.className]);
+              if (modifier)
+                scene.addEnemyModifier(modifier, true);
+            }
 
-          scene.updateModifiers(false);
+            scene.updateModifiers(false);
+          }
 
           Promise.all(loadPokemonAssets).then(() => resolve(true));
         } catch (err) {