diff --git a/Data/Scripts/010_Data/002_PBS data/008_Species.rb b/Data/Scripts/010_Data/002_PBS data/008_Species.rb
index 08f61fc10..ee6176d83 100644
--- a/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
@@ -212,11 +212,16 @@ module GameData
       return GameData::GenderRatio.get(@gender_ratio).single_gendered?
     end
 
-    def base_form
+    def default_form
       @flags.each do |flag|
         return $~[1].to_i if flag[/^DefaultForm_(\d+)$/i]
       end
-      return @form
+      return -1
+    end
+
+    def base_form
+      default = default_form
+      return (default >= 0) ? default : @form
     end
 
     def has_flag?(flag)
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 6a1cad90b..b57450709 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -124,7 +124,12 @@ class Pokemon
     new_species_data = GameData::Species.get(species_id)
     return if @species == new_species_data.species
     @species     = new_species_data.species
-    @form        = new_species_data.form if new_species_data.form != 0
+    default_form = new_species_data.default_form
+    if default_form >= 0
+      @form      = default_form
+    elsif new_species_data.form > 0
+      @form      = new_species_data.form
+    end
     @forced_form = nil
     @gender      = nil if singleGendered?
     @level       = nil   # In case growth rate is different for the new species
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
index 6fdcbc5bb..3481179e0 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb	
@@ -598,7 +598,6 @@ class PokemonEvolutionScene
     pbEvolutionMethodAfterEvolution
     # Modify Pokémon to make it evolved
     @pokemon.species = @newspecies
-    @pokemon.form    = 0 if @pokemon.isSpecies?(:MOTHIM)
     @pokemon.calc_stats
     @pokemon.ready_to_evolve = false
     # See and own evolved species
diff --git a/PBS/Gen 5/pokemon.txt b/PBS/Gen 5/pokemon.txt
index 000077a5a..c0b095927 100644
--- a/PBS/Gen 5/pokemon.txt	
+++ b/PBS/Gen 5/pokemon.txt	
@@ -10889,6 +10889,7 @@ Shape = MultiWinged
 Category = Moth
 Pokedex = It loves the honey of flowers and steals honey collected by Combee.
 Generation = 4
+Flags = DefaultForm_0
 WildItemUncommon = SILVERPOWDER
 #-------------------------------
 [COMBEE]
diff --git a/PBS/Gen 6/pokemon.txt b/PBS/Gen 6/pokemon.txt
index 03369fae5..62fa73292 100644
--- a/PBS/Gen 6/pokemon.txt	
+++ b/PBS/Gen 6/pokemon.txt	
@@ -10878,6 +10878,7 @@ Shape = MultiWinged
 Category = Moth
 Pokedex = It loves the honey of flowers and steals honey collected by Combee.
 Generation = 4
+Flags = DefaultForm_0
 WildItemUncommon = SILVERPOWDER
 #-------------------------------
 [COMBEE]
diff --git a/PBS/Gen 7/pokemon.txt b/PBS/Gen 7/pokemon.txt
index 34df94d3d..0efab8148 100644
--- a/PBS/Gen 7/pokemon.txt	
+++ b/PBS/Gen 7/pokemon.txt	
@@ -10879,6 +10879,7 @@ Shape = MultiWinged
 Category = Moth
 Pokedex = It loves the honey of flowers and steals honey collected by Combee.
 Generation = 4
+Flags = DefaultForm_0
 WildItemUncommon = SILVERPOWDER
 #-------------------------------
 [COMBEE]
diff --git a/PBS/Gen 8/pokemon.txt b/PBS/Gen 8/pokemon.txt
index a347ac4c9..445873bf1 100644
--- a/PBS/Gen 8/pokemon.txt	
+++ b/PBS/Gen 8/pokemon.txt	
@@ -10885,6 +10885,7 @@ Shape = MultiWinged
 Category = Moth
 Pokedex = It loves the honey of flowers and steals honey collected by Combee.
 Generation = 4
+Flags = DefaultForm_0
 WildItemUncommon = SILVERPOWDER
 #-------------------------------
 [COMBEE]
diff --git a/PBS/pokemon.txt b/PBS/pokemon.txt
index a347ac4c9..445873bf1 100644
--- a/PBS/pokemon.txt
+++ b/PBS/pokemon.txt
@@ -10885,6 +10885,7 @@ Shape = MultiWinged
 Category = Moth
 Pokedex = It loves the honey of flowers and steals honey collected by Combee.
 Generation = 4
+Flags = DefaultForm_0
 WildItemUncommon = SILVERPOWDER
 #-------------------------------
 [COMBEE]