diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ac1836c9d..a275b27167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ CHANGELOG
 ## HEAD (Unreleased)
 * @heff exported missing source handler functions ([view](https://github.com/videojs/video.js/pull/1787))
 * @heff fixed type support checking for an empty src string ([view](https://github.com/videojs/video.js/pull/1797))
-@carpasse fixed a bug in updating child indexes after removing components ([view](https://github.com/videojs/video.js/pull/1814))
+* @carpasse fixed a bug in updating child indexes after removing components ([view](https://github.com/videojs/video.js/pull/1814))
+* @dmlap fixed a bug where native controls would show after switching techs ([view](https://github.com/videojs/video.js/pull/1811))
 
 --------------------
 
diff --git a/src/js/media/html5.js b/src/js/media/html5.js
index 7c41ac884f..5f89df28e4 100644
--- a/src/js/media/html5.js
+++ b/src/js/media/html5.js
@@ -58,6 +58,7 @@ vjs.Html5.prototype.createEl = function(){
   var player = this.player_,
       // If possible, reuse original tag for HTML5 playback technology element
       el = player.tag,
+      attributes,
       newEl,
       clone;
 
@@ -74,8 +75,15 @@ vjs.Html5.prototype.createEl = function(){
       player.tag = null;
     } else {
       el = vjs.createEl('video');
+
+      // determine if native controls should be used
+      attributes = videojs.util.mergeOptions({}, player.tagAttributes);
+      if (!vjs.TOUCH_ENABLED || player.options()['nativeControlsForTouch'] !== true) {
+        delete attributes.controls;
+      }
+
       vjs.setElementAttributes(el,
-        vjs.obj.merge(player.tagAttributes || {}, {
+        vjs.obj.merge(attributes, {
           id:player.id() + '_html5_api',
           'class':'vjs-tech'
         })
diff --git a/test/unit/media.html5.js b/test/unit/media.html5.js
index f99520b036..20b82aa166 100644
--- a/test/unit/media.html5.js
+++ b/test/unit/media.html5.js
@@ -10,7 +10,7 @@ module('HTML5', {
       id: function(){ return 'id'; },
       el: function(){ return el; },
       options_: {},
-      options: function(){ return {}; },
+      options: function(){ return this.options_; },
       bufferedPercent: function() { return 0; },
       controls: function(){ return false; },
       usingNativeControls: function(){ return false; },
@@ -71,6 +71,19 @@ test('test playbackRate', function() {
   strictEqual(tech.playbackRate(), 0.75);
 });
 
+test('should remove the controls attribute when recreating the element', function() {
+  var el;
+  player.tagAttributes = {
+    controls: true
+  };
+  // force custom controls so the test environment is equivalent on iOS
+  player.options_['nativeControlsForTouch'] = false;
+  el = tech.createEl();
+
+  ok(!el.controls, 'controls attribute is absent');
+  ok(player.tagAttributes.controls, 'tag attribute is still present');
+});
+
 test('patchCanPlayType patches canplaytype with our function, conditionally', function() {
   // the patch runs automatically so we need to first unpatch
   vjs.Html5.unpatchCanPlayType();
diff --git a/test/unit/player.js b/test/unit/player.js
index 36c4b7cfcd..9644cdf3ee 100644
--- a/test/unit/player.js
+++ b/test/unit/player.js
@@ -534,7 +534,7 @@ test('should restore attributes from the original video tag when creating a new
   // simulate attributes stored from the original tag
   player.tagAttributes = {
     'preload': 'auto',
-    'controls': true,
+    'autoplay': true,
     'webkit-playsinline': true
   };
 
@@ -545,7 +545,7 @@ test('should restore attributes from the original video tag when creating a new
   el = vjs.Html5.prototype.createEl.call(html5Mock);
 
   equal(el.getAttribute('preload'), 'none', 'attribute was successful overridden by an option');
-  equal(el.getAttribute('controls'), '', 'controls attribute was set properly');
+  equal(el.getAttribute('autoplay'), '', 'autoplay attribute was set properly');
   equal(el.getAttribute('webkit-playsinline'), '', 'webkit-playsinline attribute was set properly');
 });