diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e2baecede..e0105ee54 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -30,7 +30,7 @@ module ApplicationHelper
     if domain == Rails.configuration.x.local_domain
       account = Account.find_local(username)
     else
-      account = Account.find_by(username: username, domain: domain)
+      account = Account.find_remote(username, domain)
     end
 
     account
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index 01e07e2e9..f05668420 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -10,7 +10,7 @@ class FollowRemoteAccountService < BaseService
 
     return Account.find_local(username) if domain == Rails.configuration.x.local_domain
 
-    account = Account.find_by(username: username, domain: domain)
+    account = Account.find_remote(username, domain)
 
     if account.nil?
       account = Account.new(username: username, domain: domain)