diff --git a/static/js/button-generator/debug-helper.js b/static/js/button-generator/debug-helper.js
index ae4e97d..8368296 100644
--- a/static/js/button-generator/debug-helper.js
+++ b/static/js/button-generator/debug-helper.js
@@ -7,7 +7,6 @@ export function debugControlValues(generator) {
   // Text controls
   console.log('Text controls:');
   console.log('  button-text:', values['button-text']);
-  console.log('  text-enabled:', values['text-enabled']);
   console.log('  font-size:', values['font-size']);
   console.log('  text-x:', values['text-x']);
   console.log('  text-y:', values['text-y']);
diff --git a/static/js/button-generator/effects/rainbow-text.js b/static/js/button-generator/effects/rainbow-text.js
index e4fa148..5431dae 100644
--- a/static/js/button-generator/effects/rainbow-text.js
+++ b/static/js/button-generator/effects/rainbow-text.js
@@ -54,8 +54,7 @@ export class RainbowTextEffect extends ButtonEffect {
 
     // Get text configuration
     const text = controlValues[`button-text${suffix}`] || '';
-    const enabled = controlValues[`text${suffix}-enabled`];
-    if (!text || !enabled) return;
+    if (!text || text.trim() === '') return;
 
     // Check if wave is also enabled - if so, skip (wave will handle rainbow)
     if (controlValues[`animate-text-wave${suffix}`]) return;
diff --git a/static/js/button-generator/effects/spin-text.js b/static/js/button-generator/effects/spin-text.js
index a075844..7c4b3ef 100644
--- a/static/js/button-generator/effects/spin-text.js
+++ b/static/js/button-generator/effects/spin-text.js
@@ -63,7 +63,7 @@ export class SpinTextEffect extends ButtonEffect {
     const suffix = this.textLineNumber === 1 ? "" : "2";
     const text = controlValues[`button-text${suffix}`] || "";
 
-    if (!text || !controlValues[`text${suffix}-enabled`]) return;
+    if (!text || text.trim() === '') return;
     if (!animState) return;
 
     const speed = controlValues[`spin-speed${suffix}`] || 1;
diff --git a/static/js/button-generator/effects/text-shadow.js b/static/js/button-generator/effects/text-shadow.js
index 3daa287..1d7a882 100644
--- a/static/js/button-generator/effects/text-shadow.js
+++ b/static/js/button-generator/effects/text-shadow.js
@@ -90,9 +90,9 @@ export class TextShadowEffect extends ButtonEffect {
 
   isEnabled(controlValues) {
     const suffix = this.textLineNumber === 1 ? "" : "2";
-    const textEnabled = controlValues[`text${suffix}-enabled`];
+    const text = controlValues[`button-text${suffix}`];
     const shadowEnabled = controlValues[`text${suffix}-shadow-enabled`];
-    return textEnabled && shadowEnabled;
+    return text && text.trim() !== "" && shadowEnabled;
   }
 
   apply(context, controlValues, animState, renderData) {
diff --git a/static/js/button-generator/effects/wave-text.js b/static/js/button-generator/effects/wave-text.js
index b394c61..61e097c 100644
--- a/static/js/button-generator/effects/wave-text.js
+++ b/static/js/button-generator/effects/wave-text.js
@@ -65,8 +65,7 @@ export class WaveTextEffect extends ButtonEffect {
 
     // Get text configuration
     const text = controlValues[`button-text${suffix}`] || '';
-    const enabled = controlValues[`text${suffix}-enabled`];
-    if (!text || !enabled) return;
+    if (!text || text.trim() === '') return;
 
     const fontSize = controlValues[`font-size${suffix}`] || 12;
     const fontWeight = controlValues[`font-bold${suffix}`] ? 'bold' : 'normal';