diff --git a/bundler/lib/bundler/definition.rb b/bundler/lib/bundler/definition.rb
index 1b03676d079f..de5e11d50f87 100644
--- a/bundler/lib/bundler/definition.rb
+++ b/bundler/lib/bundler/definition.rb
@@ -559,7 +559,7 @@ def add_current_platform
     end
 
     def current_platforms
-      [local_platform, generic_local_platform]
+      [local_platform, generic_local_platform].uniq
     end
 
     def change_reason
diff --git a/bundler/lib/bundler/resolver.rb b/bundler/lib/bundler/resolver.rb
index 3a68d7579362..327c170fbe3d 100644
--- a/bundler/lib/bundler/resolver.rb
+++ b/bundler/lib/bundler/resolver.rb
@@ -158,9 +158,8 @@ def search_for(dependency)
         # spec group.
         sg_ruby = sg.copy_for(Gem::Platform::RUBY)
         selected_sgs << sg_ruby if sg_ruby
-        all_platforms = @platforms + [platform]
-        next if all_platforms.to_a == [Gem::Platform::RUBY]
         sg_all_platforms = nil
+        all_platforms = @platforms + [platform]
         self.class.sort_platforms(all_platforms).reverse_each do |other_platform|
           if sg_all_platforms.nil?
             sg_all_platforms = sg.copy_for(other_platform)