diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index ef8f245fab..6736cb4022 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -24,11 +24,6 @@
                     <div>
                         <paper-checkbox id="chkWifi">${OptionSyncOnlyOnWifi}</paper-checkbox>
                     </div>
-
-                    <br />
-                    <div>
-                        <paper-checkbox id="chkSyncLosslessAudio">${OptionSyncLosslessAudioOriginal}</paper-checkbox>
-                    </div>
                 </div>
 
                 <br />
diff --git a/dashboard-ui/scripts/appsettings.js b/dashboard-ui/scripts/appsettings.js
index a66bff0325..ac898bf826 100644
--- a/dashboard-ui/scripts/appsettings.js
+++ b/dashboard-ui/scripts/appsettings.js
@@ -84,14 +84,6 @@
 
             return appStorage.getItem('syncOnlyOnWifi') != 'false';
         },
-        syncLosslessAudio: function (val) {
-
-            if (val != null) {
-                update('syncLosslessAudio', val.toString());
-            }
-
-            return appStorage.getItem('syncLosslessAudio') != 'false';
-        },
         syncPath: function (val) {
 
             if (val != null) {
diff --git a/dashboard-ui/scripts/mysyncsettings.js b/dashboard-ui/scripts/mysyncsettings.js
index 2d8d48b740..fe5cfcfb78 100644
--- a/dashboard-ui/scripts/mysyncsettings.js
+++ b/dashboard-ui/scripts/mysyncsettings.js
@@ -4,7 +4,6 @@
 
         page.querySelector('#txtSyncPath').value = AppSettings.syncPath();
         page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi();
-        page.querySelector('#chkSyncLosslessAudio').checked = AppSettings.syncLosslessAudio();
 
         var uploadServers = AppSettings.cameraUploadServers();
 
@@ -24,7 +23,6 @@
 
         AppSettings.syncPath(page.querySelector('#txtSyncPath').value);
         AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked);
-        AppSettings.syncLosslessAudio(page.querySelector('#chkSyncLosslessAudio').checked);
 
         AppSettings.cameraUploadServers($(".chkUploadServer", page).get().filter(function (i) {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 9d10a69cb8..fd29c29ea1 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2008,7 +2008,7 @@ var AppInfo = {};
         }
 
         if (Dashboard.isRunningInCordova() && browserInfo.android) {
-            define("audiorenderer", ["cordova/android/vlcplayer"]);
+            define("audiorenderer", ["scripts/htmlmediarenderer"]);
             define("videorenderer", ["cordova/android/vlcplayer"]);
         }
         else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
@@ -2133,23 +2133,11 @@ var AppInfo = {};
             };
 
             if (Dashboard.isRunningInCordova() && browserInfo.android) {
-                AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
-
-                // TODO: This is going to exclude it from both playback and sync, so improve on this
-                if (AppSettings.syncLosslessAudio()) {
-                    AppInfo.directPlayAudioContainers.push('flac');
-                }
-
                 AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
             }
             else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
 
-                AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
-
-                // TODO: This is going to exclude it from both playback and sync, so improve on this
-                if (AppSettings.syncLosslessAudio()) {
-                    AppInfo.directPlayAudioContainers.push('flac');
-                }
+                AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac".split(',');
             }
 
             var promises = [];