diff --git a/lib/ransack/nodes/condition.rb b/lib/ransack/nodes/condition.rb
index 735bd183..3f8bbb08 100644
--- a/lib/ransack/nodes/condition.rb
+++ b/lib/ransack/nodes/condition.rb
@@ -57,7 +57,18 @@ def extract_values_for_condition(key, context = nil)
             if context.present? && context.attribute_method?(str)
               attributes = [str]
             else
-              attributes = str.split(/_and_|_or_/)
+              # Split by combinators, but only proceed if the string actually contains them
+              # or if all individual parts are valid attributes
+              parts = str.split(/_and_|_or_/)
+              if parts.size > 1
+                # Multi-part condition with combinators - validate each part
+                attributes = parts.select { |part| context.blank? || context.attribute_method?(part) }
+                # If any part is invalid, the whole condition is invalid
+                attributes = [] if attributes.size != parts.size
+              else
+                # Single part without combinators - if context check failed above, this is invalid
+                attributes = []
+              end
             end
 
             [attributes, predicate, combinator]
diff --git a/spec/ransack/adapters/active_record/deep_association_bug_test.rb b/spec/ransack/adapters/active_record/deep_association_bug_test.rb
new file mode 100644
index 00000000..6856053b
--- /dev/null
+++ b/spec/ransack/adapters/active_record/deep_association_bug_test.rb
@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module Ransack
+  module Adapters
+    module ActiveRecord
+      describe 'Deep Association Bug Fixed Test' do
+        before do
+          Comment.delete_all
+          Article.delete_all  
+          Person.delete_all
+          
+          @john = Person.create!(name: 'John Doe', email: 'john@example.com')
+          @jane = Person.create!(name: 'Jane Smith', email: 'jane@example.com')
+          
+          @johns_post = Article.create!(person: @john, title: 'Johns Article', body: 'Content by John')
+          @janes_post = Article.create!(person: @jane, title: 'Janes Article', body: 'Content by Jane')
+          
+          @johns_comment = Comment.create!(article: @johns_post, person: @john, body: 'Johns comment on his post')
+          @janes_comment = Comment.create!(article: @janes_post, person: @jane, body: 'Janes comment on her post')
+        end
+
+        it 'should properly reject invalid deep association conditions' do
+          # Override Article to not allow person association
+          original_method = Article.method(:ransackable_associations)
+          Article.define_singleton_method(:ransackable_associations) do |auth_object = nil|
+            ['comments', 'tags', 'notes', 'recent_notes']  # Missing 'person'!
+          end
+          
+          begin
+            search = Comment.ransack(article_person_email_cont: 'john@example.com')
+            
+            # The security check should prevent condition creation
+            expect(search.base.conditions.size).to eq(0)
+            
+            # Should return all records (no filtering applied)
+            results = search.result.to_a
+            expect(results.count).to eq(2)  # Both comments returned
+            
+          ensure
+            Article.define_singleton_method(:ransackable_associations, original_method)
+          end
+        end
+
+        it 'should work correctly when associations are properly configured' do
+          # With default ApplicationRecord configuration, this should work
+          search = Comment.ransack(article_person_email_cont: 'john@example.com')
+          
+          # Should create 1 valid condition
+          expect(search.base.conditions.size).to eq(1)
+          expect(search.base.conditions.first.valid?).to be true
+          
+          # Should return only John's comment
+          results = search.result.to_a
+          expect(results.count).to eq(1)
+          expect(results.first).to eq(@johns_comment)
+        end
+
+        it 'should still handle multi-part conditions with combinators' do
+          # Test that legitimate _and_/_or_ conditions still work
+          search = Comment.ransack(article_title_or_body_cont: 'Article')
+          
+          # Should create conditions for the multi-part search
+          expect(search.base.conditions.size).to be > 0
+          
+          # Should find both articles that contain 'Article' in title or body
+          results = search.result.to_a
+          expect(results.count).to eq(2)  # Both comments should match
+        end
+
+        it 'should handle edge case where final attribute is not ransackable' do
+          # Test what happens when the final attribute (email) is not ransackable
+          original_method = Person.method(:ransackable_attributes)
+          Person.define_singleton_method(:ransackable_attributes) do |auth_object = nil|
+            ['id', 'name']  # Missing 'email'!
+          end
+          
+          begin
+            search = Comment.ransack(article_person_email_cont: 'john@example.com')
+            
+            # A condition is created, but it should have no valid attributes due to security
+            expect(search.base.conditions.size).to eq(1)
+            condition = search.base.conditions.first
+            expect(condition.attributes).to be_empty  # No valid attributes due to security
+            
+            # Should return all records (no filtering applied due to invalid condition)
+            results = search.result.to_a
+            expect(results.count).to eq(2)
+            
+            # Verify this matches direct attribute search behavior
+            direct_search = Person.ransack(email_cont: 'john@example.com')
+            direct_results = direct_search.result.to_a
+            expect(direct_results.count).to eq(2)  # Same behavior
+            
+          ensure
+            Person.define_singleton_method(:ransackable_attributes, original_method)
+          end
+        end
+      end
+    end
+  end
+end
\ No newline at end of file