diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index 74a8ad0e5..5fe508125 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -25,10 +25,12 @@ class RegistrantUser < User
 
     companies = update_contacts_before_receive(companies)
     companies
+  rescue CompanyRegister::NotAvailableError
+    return []
   end
 
   def update_contacts_before_receive(companies)
-    return if companies.blank?
+    return [] if companies.blank?
 
     companies.each do |company|
       contacts = Contact.where(ident: company.registration_number, ident_country_code: 'EE')
@@ -42,9 +44,7 @@ class RegistrantUser < User
       end
     end
 
-    return companies
-  rescue CompanyRegister::NotAvailableError
-    nil
+    companies
   end
 
   def update_company_name(contact:, company:)