diff --git a/app/models/user.rb b/app/models/user.rb
index cb37cc2bc..44094df29 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -386,6 +386,8 @@ class User < ApplicationRecord
   end
 
   def self.from_omniauth(auth)
+    return nil unless auth.provider.present? && auth.uid.present?
+
     includes(:user_identities)
       .where(
         'user_identities.provider=? AND user_identities.uid=?',