diff --git a/app/browser/reducers/autoplayReducer.js b/app/browser/reducers/autoplayReducer.js
index 0cdfd8092a..8cc7e255a1 100644
--- a/app/browser/reducers/autoplayReducer.js
+++ b/app/browser/reducers/autoplayReducer.js
@@ -9,11 +9,13 @@ const {makeImmutable} = require('../../common/state/immutableUtil')
 const {ipcMain, webContents} = require('electron')
 const AppStore = require('../../../js/stores/appStore')
 const siteSettings = require('../../../js/state/siteSettings')
+const settings = require('../../../js/constants/settings')
 const appActions = require('../../../js/actions/appActions')
 const {getOrigin} = require('../../../js/state/siteUtil')
 const locale = require('../../locale')
 const messages = require('../../../js/constants/messages')
-const urlParse = require('../../common/urlParse')
+const getSetting = require('../../../js/settings').getSetting
+const {autoplayOption} = require('../../common/constants/settingsEnums')
 
 const showAutoplayMessageBox = (tabId) => {
   const tab = webContents.fromTabID(tabId)
@@ -22,8 +24,12 @@ const showAutoplayMessageBox = (tabId) => {
   }
   const location = tab.getURL()
   const origin = getOrigin(location)
+  if (getSetting(settings.AUTOPLAY_MEDIA) === autoplayOption.ALWAYS_ALLOW) {
+    appActions.changeSiteSetting(origin, 'autoplay', true)
+    return
+  }
   const originSettings = siteSettings.getSiteSettingsForURL(AppStore.getState().get('siteSettings'), origin)
-  if (originSettings && originSettings.get('noAutoplay') === true) {
+  if (originSettings && originSettings.get('autoplay') === false) {
     return
   }
   const message = locale.translation('allowAutoplay', {origin})
@@ -43,20 +49,20 @@ const showAutoplayMessageBox = (tabId) => {
   ipcMain.once(messages.NOTIFICATION_RESPONSE, (e, msg, buttonIndex, persist) => {
     if (msg === message) {
       appActions.hideNotification(message)
-      let ruleKey = origin
-      const parsedUrl = urlParse(location)
-      if ((parsedUrl.protocol === 'https:' || parsedUrl.protocol === 'http:')) {
-        ruleKey = `https?://${parsedUrl.host}`
-      }
       if (buttonIndex === 0) {
-        appActions.changeSiteSetting(ruleKey, 'noAutoplay', false)
-
+        appActions.changeSiteSetting(origin, 'autoplay', true)
         if (tab && !tab.isDestroyed()) {
           tab.reload()
+          tab.on('destroyed', function temporaryAllow (e) {
+            if (!persist) {
+              appActions.removeSiteSetting(origin, 'autoplay')
+              // tab.removeListener('did-finish-load', temporaryAllow)
+            }
+          })
         }
       } else {
         if (persist) {
-          appActions.changeSiteSetting(ruleKey, 'noAutoplay', true)
+          appActions.changeSiteSetting(origin, 'autoplay', false)
         }
       }
     }
diff --git a/app/common/constants/settingsEnums.js b/app/common/constants/settingsEnums.js
index 0b089d0719..0b6dcc6196 100644
--- a/app/common/constants/settingsEnums.js
+++ b/app/common/constants/settingsEnums.js
@@ -32,10 +32,16 @@ const fullscreenOption = {
   ALWAYS_ALLOW: 'alwaysAllow'
 }
 
+const autoplayOption = {
+  ALWAYS_ASK: 'alwaysAsk',
+  ALWAYS_ALLOW: 'alwaysAllow'
+}
+
 module.exports = {
   startsWithOption,
   newTabMode,
   bookmarksToolbarMode,
   tabCloseAction,
-  fullscreenOption
+  fullscreenOption,
+  autoplayOption
 }
diff --git a/app/extensions/brave/locales/en-US/bravery.properties b/app/extensions/brave/locales/en-US/bravery.properties
index b95e1a314f..dbccbe3592 100644
--- a/app/extensions/brave/locales/en-US/bravery.properties
+++ b/app/extensions/brave/locales/en-US/bravery.properties
@@ -26,4 +26,3 @@ httpReroutes={[plural(httpsUpgradeCount)]}
 httpReroutes[one]=HTTPS Upgrade
 httpReroutes[other]=HTTPS Upgrades
 editBraveryGlobalSettings=Edit default shield  settings…
-noAutoplay=Block Autoplay
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
index f0bb77d801..3a553988a4 100644
--- a/app/extensions/brave/locales/en-US/preferences.properties
+++ b/app/extensions/brave/locales/en-US/preferences.properties
@@ -367,3 +367,4 @@ scaleSizeSmaller=Smaller
 scaleSizeNormal=Normal
 scaleSizeLarger=Larger
 scaleSizeSuper=Supersize
+autoplay=Autoplay Media
diff --git a/app/filtering.js b/app/filtering.js
index d89e839f85..4d7ca56c26 100644
--- a/app/filtering.js
+++ b/app/filtering.js
@@ -455,6 +455,7 @@ function registerPermissionHandler (session, partition) {
       appActions.hideNotification(message)
       const result = !!(buttonIndex)
       cb(result)
+      console.log(result)
       if (persist) {
         // remember site setting for this host
         appActions.changeSiteSetting(origin, permission + 'Permission', result, isPrivate)
diff --git a/app/locale.js b/app/locale.js
index eaa5766bd1..698ef41549 100644
--- a/app/locale.js
+++ b/app/locale.js
@@ -252,7 +252,8 @@ var rendererIdentifiers = function () {
     'importSuccessOk',
     'connectionError',
     'unknownError',
-    'allowAutoplay'
+    'allowAutoplay',
+    'autoplayMedia'
   ]
 }
 
diff --git a/app/sessionStore.js b/app/sessionStore.js
index c17e3cdcea..56d8dab781 100644
--- a/app/sessionStore.js
+++ b/app/sessionStore.js
@@ -23,6 +23,7 @@ const downloadStates = require('../js/constants/downloadStates')
 const {tabFromFrame} = require('../js/state/frameStateUtil')
 const siteUtil = require('../js/state/siteUtil')
 const { topSites, pinnedTopSites } = require('../js/data/newTabData')
+const { defaultSiteSettingsList } = require('../js/data/siteSettingsList')
 const sessionStorageVersion = 1
 const filtering = require('./filtering')
 const autofill = require('./autofill')
@@ -507,6 +508,25 @@ module.exports.runPostMigrations = (data) => {
   return data
 }
 
+module.exports.runImportDefaultSettings = (data) => {
+  // import default site settings list
+  if (!data.defaultSiteSettingsListImported) {
+    for (var i = 0; i < defaultSiteSettingsList.length; ++i) {
+      let setting = defaultSiteSettingsList[i]
+      if (!data.siteSettings[setting.pattern]) {
+        data.siteSettings[setting.pattern] = {}
+      }
+      let targetSetting = data.siteSettings[setting.pattern]
+      if (!targetSetting.hasOwnProperty[setting.name]) {
+        targetSetting[setting.name] = setting.value
+      }
+    }
+    data.defaultSiteSettingsListImported = true
+  }
+
+  return data
+}
+
 /**
  * Loads the browser state from storage.
  *
@@ -532,6 +552,7 @@ module.exports.loadAppState = () => {
         console.log('could not parse data: ', data, e)
       }
       data = exports.defaultAppState()
+      data = module.exports.runImportDefaultSettings(data)
     }
 
     if (loaded) {
@@ -561,6 +582,7 @@ module.exports.loadAppState = () => {
       }
 
       data = module.exports.runPostMigrations(data)
+      data = module.exports.runImportDefaultSettings(data)
     }
 
     data = setVersionInformation(data)
diff --git a/docs/state.md b/docs/state.md
index 9a69bacb0c..847fcceac2 100644
--- a/docs/state.md
+++ b/docs/state.md
@@ -266,9 +266,11 @@ AppStore
       savePasswords: boolean, // only false or undefined/null
       shieldsUp: boolean,
       widevine: (number|boolean), // false = block widevine, 0 = allow once, 1 = allow always
-      zoomLevel: number
+      zoomLevel: number,
+      autoplay: boolean,
     }
   },
+  defaultSiteSettingsListImported: boolean,
   sync: {
     lastFetchTimestamp: integer // the last time new sync records were fetched in seconds
     deviceId: Array.<number>,
diff --git a/js/about/preferences.js b/js/about/preferences.js
index 1463f0ea2a..16df1b08b6 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -34,7 +34,7 @@ const messages = require('../constants/messages')
 const settings = require('../constants/settings')
 const {changeSetting} = require('../../app/renderer/lib/settingsUtil')
 const {passwordManagers, extensionIds} = require('../constants/passwordManagers')
-const {startsWithOption, newTabMode, bookmarksToolbarMode, tabCloseAction, fullscreenOption} = require('../../app/common/constants/settingsEnums')
+const {startsWithOption, newTabMode, bookmarksToolbarMode, tabCloseAction, fullscreenOption, autoplayOption} = require('../../app/common/constants/settingsEnums')
 
 const aboutActions = require('./aboutActions')
 const appActions = require('../actions/appActions')
@@ -49,7 +49,6 @@ const adInsertion = appConfig.resourceNames.AD_INSERTION
 const trackingProtection = appConfig.resourceNames.TRACKING_PROTECTION
 const httpsEverywhere = appConfig.resourceNames.HTTPS_EVERYWHERE
 const safeBrowsing = appConfig.resourceNames.SAFE_BROWSING
-const noAutoplay = appConfig.resourceNames.NOAUTOPLAY
 const noScript = appConfig.resourceNames.NOSCRIPT
 const flash = appConfig.resourceNames.FLASH
 
@@ -77,7 +76,8 @@ const permissionNames = {
   'openExternalPermission': ['boolean'],
   'protocolRegistrationPermission': ['boolean'],
   'flash': ['boolean', 'number'],
-  'widevine': ['boolean', 'number']
+  'widevine': ['boolean', 'number'],
+  'autoplay': ['boolean']
 }
 
 const braveryPermissionNames = {
@@ -88,8 +88,7 @@ const braveryPermissionNames = {
   'safeBrowsing': ['boolean'],
   'httpsEverywhere': ['boolean'],
   'fingerprintingProtection': ['boolean'],
-  'noScript': ['boolean', 'number'],
-  'noAutoplay': ['boolean']
+  'noScript': ['boolean', 'number']
 }
 
 class GeneralTab extends ImmutableComponent {
@@ -498,7 +497,6 @@ class ShieldsTab extends ImmutableComponent {
     this.onChangeAdControl = this.onChangeAdControl.bind(this)
     this.onToggleHTTPSE = this.onToggleSetting.bind(this, httpsEverywhere)
     this.onToggleSafeBrowsing = this.onToggleSetting.bind(this, safeBrowsing)
-    this.onToggleNoAutoplay = this.onToggleSetting.bind(this, noAutoplay)
     this.onToggleNoScript = this.onToggleSetting.bind(this, noScript)
   }
   onChangeAdControl (e) {
@@ -549,7 +547,6 @@ class ShieldsTab extends ImmutableComponent {
         <SettingCheckbox checked={this.props.braveryDefaults.get('safeBrowsing')} dataL10nId='safeBrowsing' onChange={this.onToggleSafeBrowsing} />
         <SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScriptPref' onChange={this.onToggleNoScript} />
         <SettingCheckbox dataL10nId='blockCanvasFingerprinting' prefKey={settings.BLOCK_CANVAS_FINGERPRINTING} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
-        <SettingCheckbox checked={this.props.braveryDefaults.get('noAutoplay')} dataL10nId='noAutoplay' onChange={this.onToggleNoAutoplay} />
         <Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'
           onClick={aboutActions.createTabRequested.bind(null, {
             url: 'about:adblock'
@@ -658,6 +655,17 @@ class SecurityTab extends ImmutableComponent {
           </SettingDropdown>
         </SettingItem>
       </SettingsList>
+      <DefaultSectionTitle data-l10n-id='autoplay' />
+      <SettingsList>
+        <SettingItem>
+          <SettingDropdown
+            value={getSetting(settings.AUTOPLAY_MEDIA, this.props.settings)}
+            onChange={changeSetting.bind(null, this.props.onChangeSetting, settings.AUTOPLAY_MEDIA)}>
+            <option data-l10n-id='alwaysAsk' value={autoplayOption.ALWAYS_ASK} />
+            <option data-l10n-id='alwaysAllow' value={autoplayOption.ALWAYS_ALLOW} />
+          </SettingDropdown>
+        </SettingItem>
+      </SettingsList>
       <DefaultSectionTitle data-l10n-id='doNotTrackTitle' />
       <SettingsList>
         <SettingCheckbox dataL10nId='doNotTrack' prefKey={settings.DO_NOT_TRACK} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
diff --git a/js/components/braveryPanel.js b/js/components/braveryPanel.js
index f9a155f558..a25dd1187c 100644
--- a/js/components/braveryPanel.js
+++ b/js/components/braveryPanel.js
@@ -31,7 +31,6 @@ class BraveryPanel extends ImmutableComponent {
     this.onToggleCookieControl = this.onToggleSiteSetting.bind(this, 'cookieControl')
     this.onToggleHTTPSE = this.onToggleSiteSetting.bind(this, 'httpsEverywhere')
     this.onToggleFp = this.onToggleSiteSetting.bind(this, 'fingerprintingProtection')
-    this.onToggleNoAutoplay = this.onToggleSiteSetting.bind(this, 'noAutoplay')
     this.onReload = this.onReload.bind(this)
     this.onEditGlobal = this.onEditGlobal.bind(this)
     this.onInfoClick = this.onInfoClick.bind(this)
@@ -166,7 +165,6 @@ class BraveryPanel extends ImmutableComponent {
     const shieldsUp = this.props.braverySettings.shieldsUp
     const noScriptEnabled = this.props.braverySettings.noScript
     const httpseEnabled = this.props.braverySettings.httpsEverywhere
-    const noAutoplayEnabled = this.props.braverySettings.noAutoplay
     const adControl = this.props.braverySettings.adControl
     const fpEnabled = this.props.braverySettings.fingerprintingProtection
     const adsBlockedStat = (this.blockedAds ? this.blockedAds.size : 0) + (this.blockedByTrackingList ? this.blockedByTrackingList.size : 0)
@@ -300,7 +298,6 @@ class BraveryPanel extends ImmutableComponent {
                   </FormDropdown>
                   <SwitchControl onClick={this.onToggleHTTPSE} rightl10nId='httpsEverywhere' checkedOn={httpseEnabled} disabled={!shieldsUp} className='httpsEverywhereSwitch' />
                   <SwitchControl onClick={this.onToggleNoScript} rightl10nId='noScript' checkedOn={noScriptEnabled} disabled={!shieldsUp} className='noScriptSwitch' />
-                  <SwitchControl onClick={this.onToggleNoAutoplay} rightl10nId='noAutoplay' checkedOn={noAutoplayEnabled} disabled={!shieldsUp} className='noAutoplaySwitch' />
                 </div>
                 <div className='braveryControlGroup'>
                   <div className={cx({
diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
index 7dd3c1f07a..af15119f0b 100644
--- a/js/constants/appConfig.js
+++ b/js/constants/appConfig.js
@@ -11,7 +11,7 @@ const adHost = process.env.AD_HOST || 'https://oip.brave.com'
 
 const buildConfig = require('./buildConfig')
 const isProduction = buildConfig.nodeEnv === 'production'
-const {fullscreenOption} = require('../../app/common/constants/settingsEnums')
+const {fullscreenOption, autoplayOption} = require('../../app/common/constants/settingsEnums')
 
 module.exports = {
   name: 'Brave',
@@ -19,7 +19,6 @@ module.exports = {
   quitTimeout: 10 * 1000,
   resourceNames: {
     ADBLOCK: 'adblock',
-    NOAUTOPLAY: 'noAutoplay',
     SAFE_BROWSING: 'safeBrowsing',
     HTTPS_EVERYWHERE: 'httpsEverywhere',
     TRACKING_PROTECTION: 'trackingProtection',
@@ -36,9 +35,6 @@ module.exports = {
   cookieblock: {
     enabled: true
   },
-  noAutoplay: {
-    enabled: true
-  },
   cookieblockAll: {
     enabled: false
   },
@@ -171,6 +167,7 @@ module.exports = {
     'security.passwords.enpass-enabled': false,
     'security.passwords.bitwarden-enabled': false,
     'security.fullscreen.content': fullscreenOption.ALWAYS_ASK,
+    'security.autoplay.media': autoplayOption.ALWAYS_ASK,
     'security.flash.installed': false,
     // sync
     'sync.enabled': false,
diff --git a/js/constants/settings.js b/js/constants/settings.js
index 9b49afda85..c495c8aa7a 100644
--- a/js/constants/settings.js
+++ b/js/constants/settings.js
@@ -48,6 +48,7 @@ const settings = {
   SHUTDOWN_CLEAR_SITE_SETTINGS: 'shutdown.clear-site-settings',
   FLASH_INSTALLED: 'security.flash.installed',
   FULLSCREEN_CONTENT: 'security.fullscreen.content',
+  AUTOPLAY_MEDIA: 'security.autoplay.media',
   // Autofill
   AUTOFILL_ENABLED: 'privacy.autofill-enabled',
   // Payments Tab
diff --git a/js/data/siteSettingsList.js b/js/data/siteSettingsList.js
new file mode 100644
index 0000000000..50694d68d1
--- /dev/null
+++ b/js/data/siteSettingsList.js
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+module.exports.defaultSiteSettingsList = [
+    {
+      "name" : "autoplay",
+      "pattern" : "https://www.youtube.com",
+      "value" : true,
+    },
+    {
+      "name" : "autoplay",
+      "pattern" : "https://www.twitch.tv",
+      "value" : true,
+    }
+]
diff --git a/js/state/contentSettings.js b/js/state/contentSettings.js
index f6a2c46c17..e89f44fbbf 100644
--- a/js/state/contentSettings.js
+++ b/js/state/contentSettings.js
@@ -64,7 +64,7 @@ const getDefaultUserPrefContentSettings = (braveryDefaults, appSettings, appConf
   braveryDefaults = makeImmutable(braveryDefaults)
   return Immutable.fromJS({
     autoplay: [{
-      setting: braveryDefaults.get('noAutoplay') ? 'block' : 'allow',
+      setting: 'block',
       primaryPattern: '*'
     }],
     cookies: getDefault3rdPartyStorageSettings(braveryDefaults, appSettings, appConfig),
@@ -281,8 +281,8 @@ const siteSettingsToContentSettings = (currentSiteSettings, defaultContentSettin
     if (typeof siteSetting.get('widevine') === 'number' && braveryDefaults.get('widevine')) {
       contentSettings = addContentSettings(contentSettings, 'plugins', primaryPattern, '*', 'allow', appConfig.widevine.resourceId)
     }
-    if (typeof siteSetting.get('noAutoplay') === 'boolean') {
-      contentSettings = addContentSettings(contentSettings, 'autoplay', primaryPattern, '*', siteSetting.get('noAutoplay') ? 'block' : 'allow')
+    if (typeof siteSetting.get('autoplay') === 'boolean') {
+      contentSettings = addContentSettings(contentSettings, 'autoplay', primaryPattern, '*', siteSetting.get('autoplay') ? 'allow' : 'block')
     }
   })
   // On the second pass we consider only shieldsUp === false settings since we want those to take precedence.
@@ -296,7 +296,6 @@ const siteSettingsToContentSettings = (currentSiteSettings, defaultContentSettin
       contentSettings = addContentSettings(contentSettings, 'javascript', primaryPattern, '*', 'allow')
       contentSettings = addContentSettings(contentSettings, 'referer', primaryPattern, '*', 'allow')
       contentSettings = addContentSettings(contentSettings, 'plugins', primaryPattern, '*', 'allow')
-      contentSettings = addContentSettings(contentSettings, 'autoplay', primaryPattern, '*', 'allow')
     }
   })
   return contentSettings
diff --git a/test/bravery-components/braveryPanelTest.js b/test/bravery-components/braveryPanelTest.js
index 798098457f..0f35c0fbbb 100644
--- a/test/bravery-components/braveryPanelTest.js
+++ b/test/bravery-components/braveryPanelTest.js
@@ -1,7 +1,7 @@
 /* global describe, it, beforeEach */
 
 const Brave = require('../lib/brave')
-const {cookieControl, allowAllCookiesOption, blockAllCookiesOption, urlInput, braveMenu, braveMenuDisabled, adsBlockedStat, adsBlockedControl, showAdsOption, blockAdsOption, braveryPanel, httpsEverywhereStat, noScriptStat, noScriptSwitch, fpSwitch, noAutoplaySwitch, fpStat, noScriptNavButton, customFiltersInput, notificationBar, reloadButton} = require('../lib/selectors')
+const {cookieControl, allowAllCookiesOption, blockAllCookiesOption, urlInput, braveMenu, braveMenuDisabled, adsBlockedStat, adsBlockedControl, showAdsOption, blockAdsOption, braveryPanel, httpsEverywhereStat, noScriptStat, noScriptSwitch, fpSwitch, fpStat, noScriptNavButton, customFiltersInput} = require('../lib/selectors')
 const {getTargetAboutUrl} = require('../../js/lib/appUrlUtil')
 
 describe('Bravery Panel', function () {
@@ -513,142 +513,4 @@ describe('Bravery Panel', function () {
         })
     })
   })
-
-  describe('Autoplay test', function () {
-    Brave.beforeEach(this)
-    beforeEach(function * () {
-      yield setup(this.app.client)
-    })
-
-    it('default block', function * () {
-      const url = Brave.server.url('autoplay.html')
-      yield this.app.client
-        .tabByIndex(0)
-        .loadUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForExist(notificationBar)
-        .waitUntil(function () {
-          return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
-        })
-    })
-
-    it('allow autoplay in regular tab', function * () {
-      const url = Brave.server.url('autoplay.html')
-      yield this.app.client
-        .tabByIndex(0)
-        .loadUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForExist(notificationBar)
-        .waitUntil(function () {
-          return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
-        })
-        .openBraveMenu(braveMenu, braveryPanel)
-        .click(noAutoplaySwitch)
-        .keys(Brave.keys.ESCAPE)
-        .tabByUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === 'Autoplay playing'
-            })
-        })
-    })
-
-    it('allow autoplay in private tab', function * () {
-      const url = Brave.server.url('autoplay.html')
-      yield this.app.client
-        .newTab({ url, isPrivate: true })
-        .waitForUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForExist(notificationBar)
-        .waitUntil(function () {
-          return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
-        })
-        .openBraveMenu(braveMenu, braveryPanel)
-        .click(noAutoplaySwitch)
-        .keys(Brave.keys.ESCAPE)
-        .tabByUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === 'Autoplay playing'
-            })
-        })
-    })
-
-    it('allow autoplay in notification bar', function * () {
-      const url = Brave.server.url('autoplay.html')
-      yield this.app.client
-        .tabByIndex(0)
-        .loadUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForExist(notificationBar)
-        .waitUntil(function () {
-          return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
-        })
-        .click('button=Yes')
-        .tabByUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === 'Autoplay playing'
-            })
-        })
-    })
-
-    it('Remember block autoplay in notification bar', function * () {
-      const url = Brave.server.url('autoplay.html')
-      yield this.app.client
-        .tabByIndex(0)
-        .loadUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForExist(notificationBar)
-        .waitUntil(function () {
-          return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
-        })
-        .click('[data-l10n-id=rememberDecision]')
-        .click('button=No')
-        .windowByUrl(Brave.browserWindowUrl)
-        .click(reloadButton)
-        .tabByUrl(url)
-        .waitUntil(function () {
-          return this.getText('div[id="status"]')
-            .then((status) => {
-              return status === ''
-            })
-        })
-        .windowByUrl(Brave.browserWindowUrl)
-        .waitForElementCount('.notificationItem', 0)
-    })
-  })
 })
diff --git a/test/bravery-components/notificationBarTest.js b/test/bravery-components/notificationBarTest.js
index f390351aaa..1526e51fd9 100644
--- a/test/bravery-components/notificationBarTest.js
+++ b/test/bravery-components/notificationBarTest.js
@@ -1,7 +1,8 @@
 /* global describe, it, before, beforeEach */
 
 const Brave = require('../lib/brave')
-const {notificationBar, titleBar, urlInput} = require('../lib/selectors')
+const {notificationBar, titleBar, urlInput, reloadButton} = require('../lib/selectors')
+const {autoplayOption} = require('../../app/common/constants/settingsEnums')
 
 describe('notificationBar permissions', function () {
   function * setup (client) {
@@ -213,3 +214,220 @@ describe('permissions state', function () {
       })
   })
 })
+
+describe('Autoplay test', function () {
+  function * setup (client) {
+    yield client
+      .waitForBrowserWindow()
+      .waitForVisible(urlInput)
+  }
+
+  Brave.beforeEach(this)
+
+  beforeEach(function * () {
+    yield setup(this.app.client)
+  })
+
+  it('default always ask and block', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+  })
+
+  it('always allow', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .changeSetting('security.autoplay.media', autoplayOption.ALWAYS_ALLOW)
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+  })
+
+  it('allow autoplay until tab closed', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+      .click('button=Yes')
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .click(reloadButton)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .newTab({ url })
+      .waitForTabCount(2)
+      .waitForUrl(url)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .closeTabByIndex(0)
+      .click(reloadButton)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+  })
+
+  it('allow autoplay and remember', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+      .click('[data-l10n-id=rememberDecision]')
+      .click('button=Yes')
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .click(reloadButton)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .newTab({ url })
+      .waitForTabCount(2)
+      .waitForUrl(url)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .closeTabByIndex(0)
+      .click(reloadButton)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === 'Autoplay playing'
+          })
+      })
+  })
+
+  it('keep blocking autoplay', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+      .click('button=No')
+      .windowByUrl(Brave.browserWindowUrl)
+      .click(reloadButton)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+  })
+
+  it('keep blocking autoplay and remember', function * () {
+    const url = Brave.server.url('autoplay.html')
+    yield this.app.client
+      .tabByIndex(0)
+      .loadUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForExist(notificationBar)
+      .waitUntil(function () {
+        return this.getText(notificationBar).then((val) => val.includes('autoplay media'))
+      })
+      .click('[data-l10n-id=rememberDecision]')
+      .click('button=No')
+      .windowByUrl(Brave.browserWindowUrl)
+      .click(reloadButton)
+      .tabByUrl(url)
+      .waitUntil(function () {
+        return this.getText('div[id="status"]')
+          .then((status) => {
+            return status === ''
+          })
+      })
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitForElementCount('.notificationItem', 0)
+  })
+})
diff --git a/test/lib/selectors.js b/test/lib/selectors.js
index a212d55e1a..22637de26c 100644
--- a/test/lib/selectors.js
+++ b/test/lib/selectors.js
@@ -58,7 +58,6 @@ module.exports = {
   noScriptAllowOnceButton: '[data-l10n-id="allowScriptsOnce"]',
   noScriptAllowButton: '[data-l10n-id="allowScripts"]',
   safeBrowsingSwitch: '.safeBrowsingSwitch .switchMiddle',
-  noAutoplaySwitch: '.noAutoplaySwitch .switchMiddle',
   backButton: '.backforward .backButton',
   forwardButton: '.backforward .forwardButton',
   reloadButton: '.reloadButton',
diff --git a/test/unit/app/sessionStoreTest.js b/test/unit/app/sessionStoreTest.js
index 59fb5c2d54..19fd92e789 100644
--- a/test/unit/app/sessionStoreTest.js
+++ b/test/unit/app/sessionStoreTest.js
@@ -526,6 +526,7 @@ describe('sessionStore unit tests', function () {
     let runPostMigrationsSpy
     let localeInitSpy
     let backupSessionStub
+    let runImportDefaultSettings
 
     before(function () {
       runPreMigrationsSpy = sinon.spy(sessionStore, 'runPreMigrations')
@@ -534,6 +535,7 @@ describe('sessionStore unit tests', function () {
       runPostMigrationsSpy = sinon.spy(sessionStore, 'runPostMigrations')
       localeInitSpy = sinon.spy(fakeLocale, 'init')
       backupSessionStub = sinon.stub(sessionStore, 'backupSession')
+      runImportDefaultSettings = sinon.spy(sessionStore, 'runImportDefaultSettings')
     })
 
     after(function () {
@@ -650,6 +652,16 @@ describe('sessionStore unit tests', function () {
               assert.ok(false, 'promise was rejected: ' + JSON.stringify(result))
             })
         })
+
+        it('calls runImportDefaultSettings', function () {
+          runImportDefaultSettings.reset()
+          return sessionStore.loadAppState()
+            .then(function (result) {
+              assert.equal(runImportDefaultSettings.calledOnce, true)
+            }, function (result) {
+              assert.ok(false, 'promise was rejected: ' + JSON.stringify(result))
+            })
+        })
       })
     })
 
@@ -775,6 +787,16 @@ describe('sessionStore unit tests', function () {
         })
     })
 
+    it('calls runImportDefaultSettings', function () {
+      runImportDefaultSettings.reset()
+      return sessionStore.loadAppState()
+        .then(function (result) {
+          assert.equal(runImportDefaultSettings.calledOnce, true)
+        }, function (result) {
+          assert.ok(false, 'promise was rejected: ' + JSON.stringify(result))
+        })
+    })
+
     it('calls locale.init', function () {
       localeInitSpy.reset()
       return sessionStore.loadAppState()
@@ -836,4 +858,42 @@ describe('sessionStore unit tests', function () {
 
   describe('isProtocolHandled', function () {
   })
+
+  describe('runImportDefaultSettings', function () {
+    const { defaultSiteSettingsList } = require('../../../js/data/siteSettingsList')
+    const defaultAppState = {
+      siteSettings: {}
+    }
+    it('check defaultSiteSettingsListImported', function () {
+      assert.deepEqual(sessionStore.runImportDefaultSettings({defaultSiteSettingsListImported: true}), {defaultSiteSettingsListImported: true})
+    })
+    it('import to default app state', function () {
+      const result = sessionStore.runImportDefaultSettings(defaultAppState)
+      for (var i = 0; i < defaultSiteSettingsList.length; ++i) {
+        assert.equal(result.siteSettings.hasOwnProperty(defaultSiteSettingsList[i].pattern), true)
+        const setting = result.siteSettings[defaultSiteSettingsList[i].pattern]
+        assert.equal(setting[defaultSiteSettingsList[i].name], defaultSiteSettingsList[i].value)
+      }
+    })
+    it('import to existing app state', function () {
+      if (defaultSiteSettingsList.length >= 2) {
+        let conflictedAppstate = defaultAppState
+        conflictedAppstate.siteSettings[defaultSiteSettingsList[0].pattern] = {}
+        conflictedAppstate.siteSettings[defaultSiteSettingsList[1].pattern] = {}
+        let conflictedSetting = conflictedAppstate.siteSettings[defaultSiteSettingsList[0].pattern]
+        let sameSetting = conflictedAppstate.siteSettings[defaultSiteSettingsList[1].pattern]
+        conflictedSetting[defaultSiteSettingsList[0].name] = 'BRAVE'
+        sameSetting[defaultSiteSettingsList[1].name] = defaultSiteSettingsList[1].value
+        const result = sessionStore.runImportDefaultSettings(conflictedAppstate)
+        for (var i = 1; i < defaultSiteSettingsList.length; ++i) {
+          assert.equal(result.siteSettings.hasOwnProperty(defaultSiteSettingsList[i].pattern), true)
+          const setting = result.siteSettings[defaultSiteSettingsList[i].pattern]
+          assert.equal(setting[defaultSiteSettingsList[i].name], defaultSiteSettingsList[i].value)
+        }
+        assert.equal(result.siteSettings.hasOwnProperty(defaultSiteSettingsList[0].pattern), true)
+        const setting = result.siteSettings[defaultSiteSettingsList[0].pattern]
+        assert.equal(setting[defaultSiteSettingsList[0].name], 'BRAVE')
+      }
+    })
+  })
 })