diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index 7a696b31..f700264e 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -277,18 +277,24 @@ firmware_flasher.initialize = function (callback) {
                     $('div.build_configuration').slideDown();
 
                     const expertMode = $('.tab-firmware_flasher input.expert_mode').is(':checked');
-                    if (!expertMode) {
-                        $('div.commitSelection').hide();
-                    } else {
-                        $('div.commitSelection').show();
+                    if (expertMode) {
+                        $('div.expertOptions').show();
 
-                        self.releaseLoader.loadCommits(summary.release, (commits) => {
-                            const select_e = $('select[name="commits"]');
-                            select_e.empty();
-                            commits.forEach((commit) => {
-                                select_e.append($(`<option value='${commit.sha}'>${commit.message}</option>`));
+                        if (summary.releaseType === 'Unstable') {
+                            self.releaseLoader.loadCommits(summary.release, (commits) => {
+                                const select_e = $('select[name="commits"]');
+                                select_e.empty();
+                                commits.forEach((commit) => {
+                                    select_e.append($(`<option value='${commit.sha}'>${commit.message}</option>`));
+                                });
                             });
-                        });
+
+                            $('div.commitSelection').show();
+                        } else {
+                            $('div.commitSelection').hide();
+                        }
+                    } else {
+                        $('div.expertOptions').hide();
                     }
                 }
 
diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
index e84e2ef3..883cb237 100644
--- a/src/tabs/firmware_flasher.html
+++ b/src/tabs/firmware_flasher.html
@@ -197,9 +197,16 @@
                     </div>
                 </div>
             </div>
-            <div class="commitSelection spacer" style="margin-bottom: 10px;">
+            <div class="expertOptions spacer hide-in-classic-build-mode" style="margin-bottom: 10px;">
                 <div class="margin-bottom">
                     <div style="width: 49%; float: left;">
+                        <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
+                        <div id="customDefinesInfo" class="build-options-wrapper">
+                            <input id="customDefines" name="customDefines"></input>
+                            <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherCustomDefinesDescription"></div>
+                        </div>
+                    </div>
+                    <div class="commitSelection" style="width: 49%; float: right;">
                         <strong i18n="firmwareFlasherBranch"></strong>
                         <div id="branchInfo" class="build-options-wrapper">
                             <select id="commits" name="commits" class="select2">
@@ -207,13 +214,6 @@
                             <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherBranchDescription"></div>
                         </div>
                     </div>
-                    <div style="width: 49%; float: right;" class="hide-in-classic-build-mode">
-                        <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
-                        <div id="customDefinesInfo" class="build-options-wrapper">
-                            <input id="customDefines" name="customDefines"></input>
-                            <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherCustomDefinesDescription"></div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>