diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index b6ab4d0d9..fbdc77bcf 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -1733,11 +1733,24 @@
 				smogdexid = 'meowstic-m';
 			} else if (template.forme) {
 				switch (template.baseSpecies) {
-				case 'Vivillon':
-				case 'Keldeo':
 				case 'Basculin':
-				case 'Pikachu':
+				case 'Burmy':
 				case 'Castform':
+				case 'Cherrim':
+				case 'Deerling':
+				case 'Flabebe':
+				case 'Floette':
+				case 'Florges':
+				case 'Furfrou':
+				case 'Gastrodon':
+				case 'Genesect':
+				case 'Keldeo':
+				case 'Mimikyu':
+				case 'Minior':
+				case 'Pikachu':
+				case 'Sawsbuck':
+				case 'Shellos':
+				case 'Vivillon':
 					break;
 				default:
 					smogdexid += '-' + toId(template.forme);