diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 19b225240e..bfe833bc52 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -20,22 +20,38 @@
     }
 
     function onSubmit() {
-        Dashboard.showLoadingMsg();
 
         var form = this;
 
-        ApiClient.getNamedConfiguration("encoding").then(function (config) {
+        var onDecoderConfirmed = function() {
+            Dashboard.showLoadingMsg();
 
-            config.EnableDebugLogging = $('#chkEnableDebugEncodingLogging', form).checked();
-            config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
-            config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
-            config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
-            config.EnableThrottling = $('#chkEnableThrottle', form).checked();
-            config.EncodingThreadCount = $('#selectThreadCount', form).val();
-            config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
+            ApiClient.getNamedConfiguration("encoding").then(function (config) {
+
+                config.EnableDebugLogging = $('#chkEnableDebugEncodingLogging', form).checked();
+                config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
+                config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
+                config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
+                config.EnableThrottling = $('#chkEnableThrottle', form).checked();
+                config.EncodingThreadCount = $('#selectThreadCount', form).val();
+                config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
+
+                ApiClient.updateNamedConfiguration("encoding", config).then(Dashboard.processServerConfigurationUpdateResult);
+            });
+        };
+
+        if ($('#selectVideoDecoder', form).val()) {
+
+            Dashboard.alert({
+                callback: onDecoderConfirmed,
+                title: Globalize.translate('TitleHardwareAcceleration'),
+                message: Globalize.translate('HardwareAccelerationWarning')
+            });
+
+        } else {
+            onDecoderConfirmed();
+        }
 
-            ApiClient.updateNamedConfiguration("encoding", config).then(Dashboard.processServerConfigurationUpdateResult);
-        });
 
         // Disable default form submission
         return false;
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 185a5c47fd..940d982528 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -955,5 +955,7 @@
     "HeaderCinemaMode": "Cinema Mode",
     "CinemaModeFeatureDescription": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the feature.",
     "CoverArt": "Cover Art",
-    "ButtonOff": "Off"
+    "ButtonOff": "Off",
+    "TitleHardwareAcceleration": "Hardware Acceleration",
+    "HardwareAccelerationWarning": "Enabling hardware acceleration may cause instability in some environments. If you have difficulty playing video after enabling this, you'll need to change the setting back to Auto."
 }