diff --git a/client/src/scenes/combat.js b/client/src/scenes/combat.js
index 643258bc..f0c55f08 100644
--- a/client/src/scenes/combat.js
+++ b/client/src/scenes/combat.js
@@ -61,8 +61,7 @@ class Combat extends Phaser.Scene {
         this.registry.set('game', null);
         this.scene.get('CombatLog').cleanUp();
         this.scene.get('CombatCryps').cleanUp();
-
-        // this.scene.manager.remove('CombatSkills');
+        this.scene.get('CombatSkills').cleanUp();
         this.scene.remove();
         return true;
     }
diff --git a/client/src/scenes/combat.skills.js b/client/src/scenes/combat.skills.js
index 52cf9593..b4645c96 100644
--- a/client/src/scenes/combat.skills.js
+++ b/client/src/scenes/combat.skills.js
@@ -241,6 +241,11 @@ class CombatSkills extends Phaser.Scene {
         CRYP_KEY_MAP.forEach(tKey => this.input.keyboard.removeListener(tKey));
         SKILL_KEY_MAP.forEach(tKey => this.input.keyboard.removeListener(tKey));
     }
+
+    cleanUp() {
+        this.registry.events.off('changedata', this.updateData);
+        this.scene.remove();
+    }
 }
 
 module.exports = CombatSkills;