diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index 0019014..015dc65 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -19,8 +19,11 @@
             </a>
             {% if authenticated %}
             <div class="pull-xs-right">
-		<a href="{{ url_for('new_issue', username=username, repo=repo.name) }}"
-		   class="btn btn-success btn-sm">New Issue</a>
+              {% if repo.settings.get('issue_tracker', True)
+                    and config.get('ENABLE_TICKETS', True)%}
+              <a href="{{ url_for('new_issue', username=username, repo=repo.name) }}"
+                class="btn btn-success btn-sm">New Issue</a>
+              {% endif %}
               <div class="btn-group">
               {% if not repo.is_fork %}
                 <form method="POST" name="fork_project" id="fork_project"