diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 24e8154ef9d..b1cc016bb85 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -665,6 +665,9 @@ pref("memory_info_dumper.watch_fifo.directory", "/data/local");
 
 pref("general.useragent.enable_overrides", true);
 
+// Make <audio> and <video> talk to the AudioChannelService.
+pref("media.useAudioChannelService", true);
+
 pref("b2g.version", @MOZ_B2G_VERSION@);
 
 // Disable console buffering to save memory.
@@ -673,4 +676,4 @@ pref("consoleservice.buffered", false);
 #ifdef MOZ_WIDGET_GONK
 // Performance testing suggests 2k is a better page size for SQLite.
 pref("toolkit.storage.pageSize", 2048);
-#endif
\ No newline at end of file
+#endif
diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp
index d344abba77a..4b91b0906fd 100644
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -970,6 +970,11 @@ static bool IsAutoplayEnabled()
   return Preferences::GetBool("media.autoplay.enabled");
 }
 
+static bool UseAudioChannelService()
+{
+  return Preferences::GetBool("media.useAudioChannelService");
+}
+
 void HTMLMediaElement::UpdatePreloadAction()
 {
   PreloadAction nextAction = PRELOAD_UNDEFINED;
@@ -2163,7 +2168,10 @@ bool HTMLMediaElement::ParseAttribute(int32_t aNamespaceID,
 
 bool HTMLMediaElement::CheckAudioChannelPermissions(const nsAString& aString)
 {
-#ifdef ANDROID
+  if (!UseAudioChannelService()) {
+    return true;
+  }
+
   // Only normal channel doesn't need permission.
   if (!aString.EqualsASCII("normal")) {
     nsCOMPtr<nsIPermissionManager> permissionManager =
@@ -2179,7 +2187,7 @@ bool HTMLMediaElement::CheckAudioChannelPermissions(const nsAString& aString)
       return false;
     }
   }
-#endif
+
   return true;
 }
 
@@ -3218,17 +3226,17 @@ void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendE
 void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
 {
   nsIDocument* ownerDoc = OwnerDoc();
-#ifdef ANDROID
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(OwnerDoc());
-  if (domDoc) {
-    bool hidden = false;
-    domDoc->GetHidden(&hidden);
-    // SetVisibilityState will update mChannelSuspended via the CanPlayChanged callback.
-    if (mPlayingThroughTheAudioChannel && mAudioChannelAgent) {
-      mAudioChannelAgent->SetVisibilityState(!hidden);
+  if (UseAudioChannelService()) {
+    nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(OwnerDoc());
+    if (domDoc) {
+      bool hidden = false;
+      domDoc->GetHidden(&hidden);
+      // SetVisibilityState will update mChannelSuspended via the CanPlayChanged callback.
+      if (mPlayingThroughTheAudioChannel && mAudioChannelAgent) {
+        mAudioChannelAgent->SetVisibilityState(!hidden);
+      }
     }
   }
-#endif
   bool suspendEvents = !ownerDoc->IsActive() || !ownerDoc->IsVisible();
   bool pauseElement = suspendEvents || mChannelSuspended;
 
@@ -3656,9 +3664,10 @@ ImageContainer* HTMLMediaElement::GetImageContainer()
 
 nsresult HTMLMediaElement::UpdateChannelMuteState(bool aCanPlay)
 {
-  // Only on B2G we mute the HTMLMediaElement following the rules of
-  // AudioChannelService.
-#ifdef ANDROID
+  if (!UseAudioChannelService()) {
+    return NS_OK;
+  }
+
   // We have to mute this channel:
   if (!aCanPlay && !mChannelSuspended) {
     mChannelSuspended = true;
@@ -3669,15 +3678,15 @@ nsresult HTMLMediaElement::UpdateChannelMuteState(bool aCanPlay)
   }
 
   SuspendOrResumeElement(mChannelSuspended, false);
-#endif
-
   return NS_OK;
 }
 
 void HTMLMediaElement::UpdateAudioChannelPlayingState()
 {
-  // The HTMLMediaElement is registered to the AudioChannelService only on B2G.
-#ifdef ANDROID
+  if (!UseAudioChannelService()) {
+    return;
+  }
+
   bool playingThroughTheAudioChannel =
      (!mPaused &&
       (HasAttr(kNameSpaceID_None, nsGkAtoms::loop) ||
@@ -3711,7 +3720,6 @@ void HTMLMediaElement::UpdateAudioChannelPlayingState()
       mAudioChannelAgent = nullptr;
     }
   }
-#endif
 }
 
 /* void canPlayChanged (in boolean canPlay); */
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 393dbe156ed..c3a1d46a1ca 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -712,3 +712,6 @@ pref("media.webaudio.enabled", true);
 // This needs more tests and stability fixes first, as well as UI.
 pref("media.navigator.enabled", false);
 pref("media.peerconnection.enabled", false);
+
+// Make <audio> and <video> talk to the AudioChannelService.
+pref("media.useAudioChannelService", true);