diff --git a/app/models/app_installation.rb b/app/models/app_installation.rb
index 86192fb6..fea15e83 100644
--- a/app/models/app_installation.rb
+++ b/app/models/app_installation.rb
@@ -21,7 +21,7 @@ class AppInstallation < ApplicationRecord
         app_installation_id: self.id
       })
 
-      repository.notifications.includes(:user, :subject, :repository).find_each{|n| n.update_subject(true) }
+      repository.sync_subjects
     end
   end
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index bcc8d356..9530a36c 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -36,4 +36,22 @@ class Repository < ApplicationRecord
       last_synced_at: Time.current
     })
   end
+
+  def sync_subjects
+    UpdateRepoSubjectsWorker.perform_async_if_configured(self.id)
+  end
+
+  def sync_subjects_in_foreground
+    subject_urls = notifications.subjectable.distinct.pluck(:subject_url)
+    client = app_installation.github_client
+    subject_urls.each do |subject_url|
+      begin
+        remote_subject = client.get(subject_url)
+        SyncSubjectWorker.perform_async_if_configured(remote_subject.to_h)
+      rescue Octokit::ClientError => e
+        Rails.logger.warn("\n\n\033[32m[#{Time.current}] WARNING -- #{e.message}\033[0m\n\n")
+        nil
+      end
+    end
+  end
 end
diff --git a/app/workers/update_repo_subjects_worker.rb b/app/workers/update_repo_subjects_worker.rb
new file mode 100644
index 00000000..f17116bd
--- /dev/null
+++ b/app/workers/update_repo_subjects_worker.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class UpdateRepoSubjectsWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :sync_repos, unique: :until_and_while_executing
+
+  def perform(repository_id)
+    Repository.find_by_id(repository_id)&.sync_subjects_in_foreground
+  end
+end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 8e499f65..e9575ed8 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -4,3 +4,4 @@
   - [sync_notifications, 2]
   - [marketplace, 2]
   - [sync_subjects, 1]
+  - [sync_repos, 1]
diff --git a/test/controllers/hooks_controller_test.rb b/test/controllers/hooks_controller_test.rb
index 6d8c4463..59bc557c 100644
--- a/test/controllers/hooks_controller_test.rb
+++ b/test/controllers/hooks_controller_test.rb
@@ -19,12 +19,14 @@ class HooksControllerTest < ActionController::TestCase
   end
 
   test 'installation_repositories webhook payload' do
+    stub_access_tokens_request
     app = create(:app_installation, github_id: 293804)
     send_webhook 'installation_repositories'
     assert_equal Repository.count, 1
   end
 
   test 'installation webhook payload' do
+    stub_access_tokens_request
     send_webhook 'installation'
     assert_equal AppInstallation.count, 1
   end
diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb
index 78f740ea..72539deb 100644
--- a/test/controllers/notifications_controller_test.rb
+++ b/test/controllers/notifications_controller_test.rb
@@ -8,6 +8,7 @@ class NotificationsControllerTest < ActionDispatch::IntegrationTest
     stub_fetch_subject_enabled(value: false)
     stub_notifications_request
     stub_repository_request
+    stub_comments_requests
     @user = create(:user)
   end
 
diff --git a/test/fixtures/files/access_token.json b/test/fixtures/files/access_token.json
new file mode 100644
index 00000000..c959404d
--- /dev/null
+++ b/test/fixtures/files/access_token.json
@@ -0,0 +1,4 @@
+{
+  "token": "v1.1f699f1069f60xxx",
+  "expires_at": "2016-07-11T22:14:10Z"
+}
diff --git a/test/fixtures/files/comments.json b/test/fixtures/files/comments.json
new file mode 100644
index 00000000..fe51488c
--- /dev/null
+++ b/test/fixtures/files/comments.json
@@ -0,0 +1 @@
+[]
diff --git a/test/support/stub_helper.rb b/test/support/stub_helper.rb
index 0ba73952..36cfe05c 100644
--- a/test/support/stub_helper.rb
+++ b/test/support/stub_helper.rb
@@ -47,6 +47,8 @@ module StubHelper
       .to_return({ status: 200, body: file_fixture('subject_56.json'), headers: headers })
       stub_request(:get, 'https://api.github.com/repos/octobox/octobox/issues/57')
       .to_return({ status: 200, body: file_fixture('subject_57.json'), headers: headers })
+      stub_request(:get, 'https://api.github.com/repos/octobox/octobox/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e')
+      .to_return({ status: 200, body: file_fixture('commit_no_author.json'), headers: { 'Content-Type' => 'application/json' } })
     end
 
     url ||= %r{https://api.github.com/notifications}
@@ -56,7 +58,23 @@ module StubHelper
     stub_request(method, url).to_return(response)
   end
 
+  def stub_comments_requests(url: nil, body: nil, method: :get, extra_headers: {})
+    headers  = { 'Content-Type' => 'application/json' }.merge(extra_headers)
+
+    stub_request(:get, /\/comments\z/)
+      .to_return({ status: 200, body: file_fixture('comments.json'), headers: headers })
+  end
+
+  def stub_access_tokens_request(url: nil, body: nil, method: :get, extra_headers: {})
+    Octobox.stubs(:generate_jwt).returns('MIIEpAIBAAKCAQEA8PcoKAOyTG0rl9PUfdgey3smnkF2U0')
+    headers  = { 'Content-Type' => 'application/json' }.merge(extra_headers)
+
+    stub_request(:post, /https:\/\/api\.github\.com\/app\/installations\/\d+\/access_tokens\z/)
+      .to_return({ status: 200, body: file_fixture('access_token.json'), headers: headers })
+  end
+
   def stub_repository_request(url: nil, body: nil, method: :get, extra_headers: {})
+    stub_comments_requests
     headers  = { 'Content-Type' => 'application/json' }.merge(extra_headers)
 
     stub_request(:get, /https:\/\/api.github.com\/repos\/octobox\/octobox\z/)