diff --git a/wpilibc/wpilibC++Devices/src/Joystick.cpp b/wpilibc/wpilibC++Devices/src/Joystick.cpp
index 38fa9d87a2..739d46dfb4 100644
--- a/wpilibc/wpilibC++Devices/src/Joystick.cpp
+++ b/wpilibc/wpilibC++Devices/src/Joystick.cpp
@@ -355,6 +355,10 @@ float Joystick::GetDirectionDegrees(){
  * @param value The normalized value (0 to 1) to set the rumble to
  */
 void Joystick::SetRumble(RumbleType type, float value) {
+	if (value < 0)
+		value = 0;
+	else if (value > 1)
+		value = 1;
 	if (type == kLeftRumble)
 		m_leftRumble = value*65535;
 	else
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Joystick.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Joystick.java
index c17e76216a..a3a0e73442 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Joystick.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Joystick.java
@@ -419,6 +419,10 @@ public class Joystick extends GenericHID {
      * @param value The normalized value (0 to 1) to set the rumble to
      */
     public void setRumble(RumbleType type, float value) {
+        if (value < 0)
+            value = 0;
+        else if (value > 1)
+            value = 1;
         if (type.value == RumbleType.kLeftRumble_val)
             m_leftRumble = (short)(value*65535);
         else