diff --git a/core/src/main/java/edu/wpi/grip/core/sockets/SocketImpl.java b/core/src/main/java/edu/wpi/grip/core/sockets/SocketImpl.java
index 209488d25e..84b902b727 100644
--- a/core/src/main/java/edu/wpi/grip/core/sockets/SocketImpl.java
+++ b/core/src/main/java/edu/wpi/grip/core/sockets/SocketImpl.java
@@ -50,13 +50,15 @@ public SocketHint<T> getSocketHint() {
   }
 
   @Override
-  public synchronized void setValueOptional(Optional<? extends T> optionalValue) {
+  public void setValueOptional(Optional<? extends T> optionalValue) {
     checkNotNull(optionalValue, "The optional value can not be null");
     if (optionalValue.isPresent()) {
       getSocketHint().getType().cast(optionalValue.get());
     }
-    this.value = optionalValue;
-    onValueChanged();
+    synchronized (this) {
+      this.value = optionalValue;
+      onValueChanged();
+    }
     eventBus.post(new SocketChangedEvent(this));
   }