diff --git a/.gitignore b/.gitignore
index be881ecb7..f65bd6f41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 Graphics/CustomBattlers/*
 Graphics/Battlers/*
 Graphics/Pokemon/FusionIcons/*
-
 Data/sprites/*
 Data/VERSION
  
\ No newline at end of file
diff --git a/Data/Scripts/051_Wrappers/type_expert.rb b/Data/Scripts/051_Wrappers/type_expert.rb
index 291ac0665..a65f615a2 100644
--- a/Data/Scripts/051_Wrappers/type_expert.rb
+++ b/Data/Scripts/051_Wrappers/type_expert.rb
@@ -131,6 +131,7 @@ def type_expert_battle(type_id)
         PokemonSelection.restore
         $game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH]=false
         $game_switches[SWITCH_DONT_RANDOMIZE]=false
+        pbSet(VAR_CURRENT_GYM_TYPE, -1)
         return true
       end
     else
@@ -141,6 +142,7 @@ def type_expert_battle(type_id)
   PokemonSelection.restore
   $game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH]=false
   $game_switches[SWITCH_DONT_RANDOMIZE]=false
+  pbSet(VAR_CURRENT_GYM_TYPE, -1)
   return false
 end