diff --git a/openstackdocstheme/theme/openstackdocs/layout.html b/openstackdocstheme/theme/openstackdocs/layout.html
index 767b497a..cf0b090f 100644
--- a/openstackdocstheme/theme/openstackdocs/layout.html
+++ b/openstackdocstheme/theme/openstackdocs/layout.html
@@ -56,7 +56,9 @@ ga('send', 'pageview');
           {% if next %}
             <a href="{{ next.link|e }}"><i class="fa fa-angle-double-right" data-toggle="tooltip" data-placement="top" title="Next: {{ next.title }}"></i></a>
           {% endif %}
+          {%- if bug_project %}
             <a id="logABugLink3" href="" target="_blank" title="Found an error? Report a bug against this page"><i class="fa fa-bug" data-toggle="tooltip" data-placement="top" title="Report a Bug"></i></a>
+          {% endif %}
           </div>
           <div class="row docs-byline bottom">
             <div class="docs-updated">updated: {{ last_updated }}</div>
@@ -67,8 +69,11 @@ ga('send', 'pageview');
             </div>
             <div class="col-lg-4 col-md-4 col-sm-4 docs-actions-wrapper">
             <!-- ID buglinkbottom added so that pre-filled doc bugs
-                 are sent to Launchpad projects related to the document -->
+                 are sent to Launchpad projects related to the
+                 document -->
+              {%- if bug_project %}
               <a href="#" id="logABugLink2" class="docs-footer-actions"><i class="fa fa-bug"></i> found an error? report a bug</a>
+              {%- endif %}
               <a href="http://ask.openstack.org" class="docs-footer-actions"><i class="fa fa-question-circle"></i> questions?</a>
             </div>
           </div>
diff --git a/openstackdocstheme/theme/openstackdocs/script_footer.html b/openstackdocstheme/theme/openstackdocs/script_footer.html
index 5654a0bd..214dfe7f 100644
--- a/openstackdocstheme/theme/openstackdocs/script_footer.html
+++ b/openstackdocstheme/theme/openstackdocs/script_footer.html
@@ -38,8 +38,6 @@
     var gitSha = "SHA: {{ gitsha }}";
     {%- if bug_project %}
         var bugProject = "{{ bug_project }}";
-    {%- else %}
-        var bugProject = "openstack-manuals";
     {%- endif %}
     {%- if bug_title %}
         var bugTitle = "{{ bug_title }}";
diff --git a/openstackdocstheme/theme/openstackdocs/titlerow.html b/openstackdocstheme/theme/openstackdocs/titlerow.html
index 3ed85847..9549f61e 100644
--- a/openstackdocstheme/theme/openstackdocs/titlerow.html
+++ b/openstackdocstheme/theme/openstackdocs/titlerow.html
@@ -13,6 +13,8 @@
     {% if next %}
     <a href="{{ next.link|e }}"><i class="fa fa-angle-double-right" data-toggle="tooltip" data-placement="top" title="Next: {{ next.title }}"></i></a>
     {% endif %}
+    {%- if bug_project %}
     <a id="logABugLink1" href="" target="_blank" title="Found an error? Report a bug against this page"><i class="fa fa-bug" data-toggle="tooltip" data-placement="top" title="Report a Bug"></i></a>
+    {% endif %}
   </div>
 </div>
diff --git a/releasenotes/notes/bug_project-d26160cfe5324694.yaml b/releasenotes/notes/bug_project-d26160cfe5324694.yaml
new file mode 100644
index 00000000..2039c45f
--- /dev/null
+++ b/releasenotes/notes/bug_project-d26160cfe5324694.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - If ``bug_project`` is not set, the "Report a bug" links are not
+    displayed at all.