diff --git a/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc
index 41085a4760..ecfb5c252b 100644
--- a/common_audio/smoothing_filter.cc
+++ b/common_audio/smoothing_filter.cc
@@ -43,7 +43,7 @@ void SmoothingFilterImpl::AddSample(float sample) {
     // This is equivalent to assuming the filter has been receiving the same
     // value as the first sample since time -infinity.
     state_ = last_sample_ = sample;
-    init_end_time_ms_ = rtc::Optional<int64_t>(now_ms + init_time_ms_);
+    init_end_time_ms_ = now_ms + init_time_ms_;
     last_state_time_ms_ = now_ms;
     return;
   }
@@ -55,10 +55,10 @@ void SmoothingFilterImpl::AddSample(float sample) {
 rtc::Optional<float> SmoothingFilterImpl::GetAverage() {
   if (!init_end_time_ms_) {
     // |init_end_time_ms_| undefined since we have not received any sample.
-    return rtc::Optional<float>();
+    return rtc::nullopt;
   }
   ExtrapolateLastSample(rtc::TimeMillis());
-  return rtc::Optional<float>(state_);
+  return state_;
 }
 
 bool SmoothingFilterImpl::SetTimeConstantMs(int time_constant_ms) {
diff --git a/common_audio/smoothing_filter_unittest.cc b/common_audio/smoothing_filter_unittest.cc
index 9d93d6d4a5..d173c9ab85 100644
--- a/common_audio/smoothing_filter_unittest.cc
+++ b/common_audio/smoothing_filter_unittest.cc
@@ -132,8 +132,7 @@ TEST(SmoothingFilterTest, GetAverageOutputsEmptyBeforeFirstSample) {
   EXPECT_FALSE(states.smoothing_filter.GetAverage());
   constexpr float kFirstSample = 1.2345f;
   states.smoothing_filter.AddSample(kFirstSample);
-  EXPECT_EQ(rtc::Optional<float>(kFirstSample),
-            states.smoothing_filter.GetAverage());
+  EXPECT_EQ(kFirstSample, states.smoothing_filter.GetAverage());
 }
 
 TEST(SmoothingFilterTest, CannotChangeTimeConstantDuringInitialization) {