--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -319,16 +319,38 @@ public:
   explicit SeekingState(Master* aPtr) : StateObject(aPtr) {}
 
   State GetState() const override
   {
     return DECODER_STATE_SEEKING;
   }
 };
 
+class MediaDecoderStateMachine::BufferingState
+  : public MediaDecoderStateMachine::StateObject
+{
+public:
+  explicit BufferingState(Master* aPtr) : StateObject(aPtr) {}
+
+  void Enter() override
+  {
+    mMaster->StartBuffering();
+  }
+
+  void Step() override
+  {
+    mMaster->StepBuffering();
+  }
+
+  State GetState() const override
+  {
+    return DECODER_STATE_BUFFERING;
+  }
+};
+
 #define INIT_WATCHABLE(name, val) \
   name(val, "MediaDecoderStateMachine::" #name)
 #define INIT_MIRROR(name, val) \
   name(mTaskQueue, val, "MediaDecoderStateMachine::" #name " (Mirror)")
 #define INIT_CANONICAL(name, val) \
   name(mTaskQueue, val, "MediaDecoderStateMachine::" #name " (Canonical)")
 
 MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
@@ -1201,16 +1223,19 @@ MediaDecoderStateMachine::SetState(State
       mStateObj = MakeUnique<DecodingFirstFrameState>(this);
       break;
     case DECODER_STATE_DECODING:
       mStateObj = MakeUnique<DecodingState>(this);
       break;
     case DECODER_STATE_SEEKING:
       mStateObj = MakeUnique<SeekingState>(this);
       break;
+    case DECODER_STATE_BUFFERING:
+      mStateObj = MakeUnique<BufferingState>(this);
+      break;
     default:
       mStateObj = nullptr;
       break;
   }
 
   EnterState();
 }
 
@@ -1244,19 +1269,16 @@ MediaDecoderStateMachine::EnterState()
 
   if (mStateObj) {
     MOZ_ASSERT(mState == mStateObj->GetState());
     mStateObj->Enter();
     return;
   }
 
   switch (mState) {
-    case DECODER_STATE_BUFFERING:
-      StartBuffering();
-      break;
     case DECODER_STATE_COMPLETED:
       ScheduleStateMachine();
       break;
     case DECODER_STATE_SHUTDOWN:
       mIsShutdown = true;
       break;
     default:
       break;
@@ -2407,19 +2429,16 @@ MediaDecoderStateMachine::RunStateMachin
   mDispatchedStateMachine = false;
 
   if (mStateObj) {
     mStateObj->Step();
     return;
   }
 
   switch (mState) {
-    case DECODER_STATE_BUFFERING:
-      StepBuffering();
-      return;
     case DECODER_STATE_COMPLETED:
       StepCompleted();
       return;
     default:
       return;
   }
 }