--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -4101,18 +4101,22 @@ HTMLMediaElement::PlayInternal(ErrorResu
   mAutoplaying = false;
 
   // We changed mPaused and mAutoplaying which can affect AddRemoveSelfReference
   // and our preload status.
   AddRemoveSelfReference();
   UpdatePreloadAction();
   UpdateSrcMediaStreamPlaying();
 
-  // once media start playing, we would always allow it to autoplay
-  mIsBlessed = true;
+  // Once play() has been called in a user generated event handler,
+  // it is allowed to autoplay. Note: we can reach here when not in
+  // a user generated event handler if our readyState has not yet
+  // reached HAVE_METADATA.
+  mIsBlessed |= EventStateManager::IsHandlingUserInput();
+
 
   // TODO: If the playback has ended, then the user agent must set
   // seek to the effective start.
 
   // 4.8.12.8 - Step 6:
   // If the media element's paused attribute is true, run the following steps:
   if (oldPaused) {
     // 6.1. Change the value of paused to false. (Already done.)
@@ -5960,18 +5964,19 @@ HTMLMediaElement::ChangeReadyState(nsMed
       mReadyState >= HAVE_FUTURE_DATA) {
     DispatchAsyncEvent(NS_LITERAL_STRING("canplay"));
     if (!mPaused) {
       if (mAttemptPlayUponLoadedMetadata && mDecoder) {
         mAttemptPlayUponLoadedMetadata = false;
         if (IsAllowedToPlay()) {
           mDecoder->Play();
         } else {
+          mPaused = true;
+          DispatchAsyncEvent(NS_LITERAL_STRING("pause"));
           AsyncRejectPendingPlayPromises(NS_ERROR_DOM_MEDIA_NOT_ALLOWED_ERR);
-          mPaused = true;
         }
       }
       NotifyAboutPlaying();
     }
   }
 
   CheckAutoplayDataReady();
 

--- a/dom/media/test/file_autoplay_policy_play_before_loadedmetadata.html
+++ b/dom/media/test/file_autoplay_policy_play_before_loadedmetadata.html
@@ -24,21 +24,26 @@
 
         async function testPlayBeforeLoadedMetata(testCase, parent_window) {
           info("testPlayBeforeLoadedMetata: " + testCase.resource);
 
           let element = document.createElement("video");
           element.preload = "auto";
           element.src = testCase.resource;
           document.body.appendChild(element);
-
+          is(element.paused, true, testCase.resource + " - should start out paused.");
+          let playEventFired = false;
+          once(element, "play").then(() => { playEventFired = true; });
+          let pauseEventFired = false;
+          once(element, "pause").then(() => { pauseEventFired = true; });
           let played = await element.play().then(() => true, () => false);
           let msg = testCase.resource + " should " + (!testCase.shouldPlay ? "not " : "") + "play";
           is(played, testCase.shouldPlay, msg);
-
+          is(playEventFired, true, testCase.resource + " - we should always get a play event");
+          is(pauseEventFired, !testCase.shouldPlay, testCase.resource + " - if we shouldn't play, we should get a pause event");
           removeNodeAndSource(element);
         }
 
         nextWindowMessage().then(
           async (event) => {
             await testPlayBeforeLoadedMetata(event.data, event.source);
             event.source.postMessage("done", "*");
           });