diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index ac6c276..3a35f1b 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -54,7 +54,7 @@
                    repo=repo.name) }}">Tree</a>
       </li>
 
-      {% if repo.issue_tracker %}
+      {% if repo.settings.get('issue_tracker', True) %}
       <li {% if select == 'issues' %}class="selected" {% endif %}>
           <a href="{{ url_for('view_issues', username=username,
                      repo=repo.name) }}">Issues</a>
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 980273e..88d4244 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -48,7 +48,7 @@ def update_issue(repo, issueid, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
-    if not repo.issue_tracker:
+    if not repo.settings.get('issue_tracker', True):
         flask.abort(404, 'No issue tracker found for this project')
 
     issue = pagure.lib.search_issues(SESSION, repo, issueid=issueid)
@@ -276,7 +276,7 @@ def view_issues(repo, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
-    if not repo.issue_tracker:
+    if not repo.settings.get('issue_tracker', True):
         flask.abort(404, 'No issue tracker found for this project')
 
     # Hide private tickets
@@ -357,6 +357,9 @@ def new_issue(repo, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
+    if not repo.settings.get('issue_tracker', True):
+        flask.abort(404, 'No issue tracker found for this project')
+
     status = pagure.lib.get_issue_statuses(SESSION)
     form = pagure.forms.IssueForm(status=status)
     if form.validate_on_submit():
@@ -430,7 +433,7 @@ def view_issue(repo, issueid, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
-    if not repo.issue_tracker:
+    if not repo.settings.get('issue_tracker', True):
         flask.abort(404, 'No issue tracker found for this project')
 
     issue = pagure.lib.search_issues(SESSION, repo, issueid=issueid)
@@ -474,7 +477,7 @@ def edit_issue(repo, issueid, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
-    if not repo.issue_tracker:
+    if not repo.settings.get('issue_tracker', True):
         flask.abort(404, 'No issue tracker found for this project')
 
     if not is_repo_admin(repo):
@@ -544,7 +547,7 @@ def upload_issue(repo, issueid, username=None):
     if repo is None:
         flask.abort(404, 'Project not found')
 
-    if not repo.issue_tracker:
+    if not repo.settings.get('issue_tracker', True):
         flask.abort(404, 'No issue tracker found for this project')
 
     issue = pagure.lib.search_issues(SESSION, repo, issueid=issueid)
@@ -589,6 +592,9 @@ def view_issue_raw_file(repo, filename=None, username=None):
     if not repo:
         flask.abort(404, 'Project not found')
 
+    if not repo.settings.get('issue_tracker', True):
+        flask.abort(404, 'No issue tracker found for this project')
+
     reponame = os.path.join(APP.config['TICKETS_FOLDER'], repo.path)
 
     repo_obj = pygit2.Repository(reponame)