diff --git a/api/rtc_error.h b/api/rtc_error.h
index 00b0855bec..7adf30eacf 100644
--- a/api/rtc_error.h
+++ b/api/rtc_error.h
@@ -308,23 +308,23 @@ class RTCErrorOr {
   // the stack.
   const T& value() const {
     RTC_DCHECK(ok());
-    return value_;
+    return *value_;
   }
   T& value() {
     RTC_DCHECK(ok());
-    return value_;
+    return *value_;
   }
 
   // Moves our current value out of this object and returns it, or DCHECK-fails
   // if !this->ok().
   T MoveValue() {
     RTC_DCHECK(ok());
-    return std::move(value_);
+    return std::move(*value_);
   }
 
  private:
   RTCError error_;
-  T value_;
+  absl::optional<T> value_;
 };
 
 }  // namespace webrtc