diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index ae774abec..a72e10304 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -129,7 +129,7 @@
 		update: function () {
 			teams = Storage.teams;
 			if (this.curTeam) {
-				this.ignoreEVLimits = (this.curTeam.gen < 3 || this.curTeam.format.includes('hackmons') || this.curTeam.format === 'gen8metronomebattle');
+				this.ignoreEVLimits = (this.curTeam.gen < 3 || (this.curTeam.format.includes('hackmons') && this.curTeam.gen !== 6) || this.curTeam.format === 'gen8metronomebattle');
 				if (this.curSet) {
 					return this.updateSetView();
 				}