diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
index 5b0b37f3..13fc594a 100644
--- a/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
+++ b/Controllers/ThermaltakeRiingController/ThermaltakeRiingController.cpp
@@ -102,7 +102,7 @@ void ThermaltakeRiingController::SendRGB
     usb_buf[0x00]   = 0x32;
     usb_buf[0x01]   = 0x52;
     usb_buf[0x02]   = port;
-    usb_buf[0x03]   = mode + speed;
+    usb_buf[0x03]   = mode + ( speed & 0x03 );
 
     /*-----------------------------------------------------*\
     | Copy in GRB color data                                |
diff --git a/RGBController/RGBController_ThermaltakeRiing.cpp b/RGBController/RGBController_ThermaltakeRiing.cpp
index 7471de1e..d7de43e4 100644
--- a/RGBController/RGBController_ThermaltakeRiing.cpp
+++ b/RGBController/RGBController_ThermaltakeRiing.cpp
@@ -209,7 +209,7 @@ void RGBController_ThermaltakeRiing::UpdateSingleLED(int led)
 
 void RGBController_ThermaltakeRiing::SetCustomMode()
 {
-    SetMode(6);
+    active_mode = 6;
 }
 
 void RGBController_ThermaltakeRiing::UpdateMode()