diff --git a/keyboards/bigswitch/bigswitch.c b/keyboards/bigswitch/bigswitch.c
index 05935f2e9e..3cc11e6026 100644
--- a/keyboards/bigswitch/bigswitch.c
+++ b/keyboards/bigswitch/bigswitch.c
@@ -16,7 +16,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "bigswitch.h"
 
+volatile uint8_t runonce = true;
+static uint16_t my_timer;
+
 void matrix_init_user(void) {
-  rgblight_enable();
-  rgblight_mode(9);
+  my_timer = timer_read();
+}
+
+void matrix_scan_user(void) {
+  if (runonce && timer_elapsed(my_timer) > 1000) {
+    runonce = false;
+    rgblight_sethsv(0x0, 0xff, 0x80);
+    rgblight_mode(9);
+    rgblight_enable();
+  }
 }
diff --git a/keyboards/bigswitch/config.h b/keyboards/bigswitch/config.h
index b6cbf06e92..cc290fd79b 100755
--- a/keyboards/bigswitch/config.h
+++ b/keyboards/bigswitch/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 5
+#define RGBLED_NUM 8
 #endif
 
 #endif