diff --git a/CHANGELOG b/CHANGELOG
index bb5bde9b08b82824d47efc5f3cf3270af3820d66..b767996bc82aa5ebe7607b3c0a9c9a1c0e863863 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -99,6 +99,7 @@ v 8.9.0 (unreleased)
   - Remove tanuki logo from side navigation; center on top nav
   - Include user relationships when retrieving award_emoji
   - Various associations are now eager loaded when parsing issue references to reduce the number of queries executed
+  - Set inverse_of for Project/Service association to reduce the number of queries
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds
diff --git a/app/models/project.rb b/app/models/project.rb
index fdbc84474ed9e367e5ebe8baaf9aad3aa04deb46..0bb815e64e7c62bfaa2ec03648ec1bdaae876757 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -81,7 +81,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 :gitlab_issue_tracker_service, dependent: :destroy, inverse_of: :project
   has_one :external_wiki_service, dependent: :destroy
 
   has_one  :forked_project_link,  dependent: :destroy, foreign_key: "forked_to_project_id"
diff --git a/app/models/service.rb b/app/models/service.rb
index bf3523975092e8c2e0601e08012c7828bb0f0ad8..40d39933ad873ededeee4281602bd4462c839ed5 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -18,7 +18,7 @@ class Service < ActiveRecord::Base
   after_commit :reset_updated_properties
   after_commit :cache_project_has_external_issue_tracker
 
-  belongs_to :project
+  belongs_to :project, inverse_of: :services
   has_one :service_hook
 
   validates :project_id, presence: true, unless: Proc.new { |service| service.template? }