diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index c08a3a1c5..c733fbde2 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -1233,7 +1233,7 @@
 			} else if (move === 'Return') {
 				this.curSet.happiness = 255;
 			} else if (move === 'Frustration') {
-				this.curSet.happiness = 0;
+				this.curSet.happiness = 1;
 			}
 		},
 		setPokemon: function(val, selectNext) {