diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/Encoder.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/Encoder.java
index 9eaf4b6c17..433a4dda1f 100644
--- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/Encoder.java
+++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/Encoder.java
@@ -99,6 +99,7 @@ public class Encoder extends SensorBase implements CounterBase, PIDSource,
 			break;
 		}
 		m_distancePerPulse = 1.0;
+		m_pidSource = PIDSourceParameter.kDistance;
 
 		UsageReporting.report(tResourceType.kResourceType_Encoder,
 				m_index, m_encodingType.value);