diff --git a/HyperionRGB/HyperionRGB.ino b/HyperionRGB/HyperionRGB.ino
index 6f7a733..e4bdecc 100644
--- a/HyperionRGB/HyperionRGB.ino
+++ b/HyperionRGB/HyperionRGB.ino
@@ -61,7 +61,7 @@ void animationStep() {
   }
 }
 
-void changeMode(Mode newMode, double interval = 1.0d) {
+void changeMode(Mode newMode, double interval = 0.0d) {
   if (newMode != activeMode) {
     Log.info("Mode changed to %i", newMode);
     activeMode = newMode;
@@ -76,7 +76,13 @@ void changeMode(Mode newMode, double interval = 1.0d) {
       case STATIC_COLOR:
         break;
       case RAINBOW:
+        if (interval == 0.0d)
+          interval = 500;
+        animationThread.setInterval(interval);
+        break;
       case FIRE2012:
+        if (interval == 0.0d)
+          interval = 16;
         animationThread.setInterval(interval);
         break;
       case HYPERION_UDP:
@@ -193,7 +199,7 @@ void setup(void) {
   threadController.add(&statusThread);
 
   animationThread.onRun(animationStep);
-  animationThread.setInterval(500);
+  animationThread.setInterval(1000);
   
   resetThread.onRun(resetMode);
   #ifdef CONFIG_ENABLE_WEBCONFIG