diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ad13a0ac3e45e057fb7a5cd987e36eeb521eee1d..36e1370676870eb0e05b1292c124a8c2e1a318df 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
   end
 
   def add_gon_variables
-    gon.default_issues_tracker = Project.issues_tracker.default_value
+    gon.default_issues_tracker = Project.new.default_issue_tracker.to_param
     gon.api_version = API::API.version
     gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
     gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 09bccb4bf8fb90447bd3f95b0d36f82f42f77438..5dda869a154634e758a5daab8dd848015ceed1cb 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -9,7 +9,7 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def index
     @project.build_missing_services
-    @services = @project.services.reload
+    @services = @project.services.where.not(type: 'GitlabIssueTrackerService').reload
   end
 
   def edit
@@ -17,9 +17,6 @@ class Projects::ServicesController < Projects::ApplicationController
 
   def update
     if @service.update_attributes(service_params)
-      if @service.activated? && @service.issue_tracker?
-        @project.update_attributes(issues_tracker: @service.to_param)
-      end
       redirect_to edit_project_service_path(@project, @service.to_param),
        notice: 'Successfully updated.'
     else
diff --git a/app/models/project.rb b/app/models/project.rb
index 12751bb77e6ee6b57283b27b1e96b09b67d54d30..9e31c019fd3930ca9a4f15ca635c33647b6c34bf 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -77,6 +77,7 @@ class Project < ActiveRecord::Base
   has_one :jira_service, dependent: :destroy
   has_one :redmine_service, dependent: :destroy
   has_one :custom_issue_tracker_service, dependent: :destroy
+  has_one :gitlab_issue_tracker_service, dependent: :destroy
 
   has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
 
@@ -149,8 +150,6 @@ class Project < ActiveRecord::Base
   scope :public_and_internal_only, -> { where(visibility_level: Project.public_and_internal_levels) }
   scope :non_archived, -> { where(archived: false) }
 
-  enumerize :issues_tracker, in: (Service.issue_tracker_service_list).append(:gitlab), default: :gitlab
-
   state_machine :import_status, initial: :none do
     event :import_start do
       transition [:none, :finished] => :started
@@ -317,19 +316,32 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def default_issue_tracker
+    unless gitlab_issue_tracker_service
+      create_gitlab_issue_tracker_service
+    end
+
+    gitlab_issue_tracker_service
+  end
+
+  def issues_tracker
+    if external_issue_tracker
+      external_issue_tracker
+    else
+      default_issue_tracker
+    end
+  end
+
   def default_issues_tracker?
     if external_issue_tracker
       false
     else
-      unless self.issues_tracker == Project.issues_tracker.default_value
-        self.update_attributes(issues_tracker: Project.issues_tracker.default_value)
-      end
       true
     end
   end
 
   def external_issues_trackers
-    services.select { |service| service.issue_tracker? }
+    services.select(&:issue_tracker?).reject(&:default?)
   end
 
   def external_issue_tracker
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..46649a74751e8d34ca90af2d715942f4163f759c
--- /dev/null
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -0,0 +1,13 @@
+class GitlabIssueTrackerService < IssueTrackerService
+
+  prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
+
+
+  def default?
+    true
+  end
+
+  def to_param
+    'gitlab'
+  end
+end
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index fc7b2fe5acdfdee15ccbcd7aea547856c115a032..810ecbe46fc6291241798b35c86f92e3150b1284 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -6,6 +6,10 @@ class IssueTrackerService < Service
     :issue_tracker
   end
 
+  def default?
+    false
+  end
+
   def project_url
     # implement inside child
   end