diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js
index 450148de..0b0a58fe 100644
--- a/components/wifi-manager/code.js
+++ b/components/wifi-manager/code.js
@@ -16,8 +16,9 @@ var recovery = false;
 var enableAPTimer = true;
 var enableStatusTimer = true;
 var commandHeader = 'squeezelite -b 500:2000 -d all=info ';
-var pname, ver, otapct;
+var pname, ver, otapct, otadsc;
 var blockAjax = false;
+var blockFlashButton = false;
 
 var apList = null;
 var selectedSSID = "";
@@ -228,6 +229,8 @@ $(document).ready(function(){
     });
 
     $("#flash").on("click", function() {
+        if (blockFlashButton) return;
+        blockFlashButton = true;
         var url = $("#fwurl").val();
         $.ajax({
             url: '/config.json',
@@ -508,6 +511,16 @@ function checkStatus(){
             $('.progress-bar').css('width', otapct+'%').attr('aria-valuenow', otapct);
             $('.progress-bar').html(otapct+'%');
         }
+        if(data.hasOwnProperty('ota_dsc') && data['ota_dsc'] != ''){
+            otadsc = data['ota_dsc'];
+            $("span#flash-status").html(otadsc);
+            if (otadsc.match(/Error:/) || otapct > 95) {
+                blockFlashButton = false;
+                enableStatusTimer = true;
+            }
+        } else {
+            $("span#flash-status").html('');
+        }
         blockAjax = false;
     })
     .fail(function() {
diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html
index d7d63e30..03bc126f 100644
--- a/components/wifi-manager/index.html
+++ b/components/wifi-manager/index.html
@@ -276,7 +276,7 @@
                 <h2>Firmware URL:</h2>
                 <textarea id="fwurl" maxlength="120"></textarea>
                 <div class="buttons">
-                    <input type="button" id="flash" class="btn btn-danger" value="Flash!" />
+                    <input type="button" id="flash" class="btn btn-danger" value="Flash!" /><span id="flash-status"></span>
                 </div>
                 <div id="otadiv">
                     <div class="progress" id="progress">
diff --git a/components/wifi-manager/style.css b/components/wifi-manager/style.css
index fffe6c42..10718f81 100644
--- a/components/wifi-manager/style.css
+++ b/components/wifi-manager/style.css
@@ -302,6 +302,11 @@ input, textarea {
     background-color: #037AF0;
 }
 
+span#flash-status {
+    padding-left: 15px;
+    font-size: 120%;
+}
+
 .footer {
   position: fixed;
   left: 0;