diff --git a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6
index a3c077748..910b8d661 100644
--- a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6
@@ -2,6 +2,12 @@ import computed from 'ember-addons/ember-computed-decorators';
 export default Ember.Component.extend({
   classNames: ['hamburger-panel'],
 
+  @computed('currentUser.read_faq')
+  prioritizeFaq(readFaq) {
+    // If it's a custom FAQ never prioritize it
+    return Ember.isEmpty(this.siteSettings.faq_url) && !readFaq;
+  },
+
   @computed()
   showKeyboardShortcuts() {
     return !Discourse.Mobile.mobileView && !this.capabilities.touch;
diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
index ee75d18a7..fe7050955 100644
--- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
@@ -1,5 +1,5 @@
 {{#menu-panel visible=visible}}
-  {{#unless currentUser.read_faq}}
+  {{#if prioritizeFaq}}
     {{#menu-links}}
       <li class='heading'>
         {{#d-link path=faqUrl class="faq-link"}}
@@ -8,7 +8,7 @@
         {{/d-link}}
       </li>
     {{/menu-links}}
-  {{/unless}}
+  {{/if}}
 
   {{#if currentUser.staff}}
     {{#menu-links}}
@@ -81,9 +81,9 @@
 
   {{#menu-links omitRule="true"}}
     <li>{{d-link route="about" class="about-link" label="about.simple_title"}}</li>
-    {{#if currentUser.read_faq}}
+    {{#unless prioritizeFaq}}
       <li>{{d-link path=faqUrl class="faq-link" label="faq"}}</li>
-    {{/if}}
+    {{/unless}}
 
     {{#if showKeyboardShortcuts}}
       <li>{{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}</li>