diff --git a/wpilibc/wpilibC++Devices/src/Relay.cpp b/wpilibc/wpilibC++Devices/src/Relay.cpp
index 6cbe81d5a0..a4c65e1ee0 100644
--- a/wpilibc/wpilibC++Devices/src/Relay.cpp
+++ b/wpilibc/wpilibC++Devices/src/Relay.cpp
@@ -215,6 +215,7 @@ Relay::Value Relay::Get() {
 void Relay::ValueChanged(ITable* source, const std::string& key, EntryValue value, bool isNew) {
 	std::string *val = (std::string *) value.ptr;
 	if (*val == "Off") Set(kOff);
+        else if (*val == "On") Set(kOn);
 	else if (*val == "Forward") Set(kForward);
 	else if (*val == "Reverse") Set(kReverse);
 }
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Relay.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Relay.java
index cb648155eb..ea1ef16774 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Relay.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Relay.java
@@ -388,6 +388,8 @@ public class Relay extends SensorBase implements LiveWindowSendable {
 				String val = ((String) value);
 				if (val.equals("Off")) {
 					set(Value.kOff);
+				} else if (val.equals("On")) {
+					set(Value.kOn);
 				} else if (val.equals("Forward")) {
 					set(Value.kForward);
 				} else if (val.equals("Reverse")) {