diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogGyro.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogGyro.java
index 9b1d8b5775..c2d541072d 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogGyro.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogGyro.java
@@ -165,7 +165,7 @@ public class AnalogGyro extends GyroBase implements Gyro, PIDSource, LiveWindowS
   /**
    * {@inheritDoc}
    */
-  public double getAngle() {
+  public synchronized double getAngle() {
     if (m_analog == null) {
       return 0.0;
     } else {