From 5a54444a05f3b20476a2ea7d5aa3caa43fdb8905 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Tue, 3 Jun 2025 14:28:45 +0100
Subject: [PATCH] Update Select.php

---
 packages/forms/src/Components/Select.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/forms/src/Components/Select.php b/packages/forms/src/Components/Select.php
index b748879940..1f880da436 100644
--- a/packages/forms/src/Components/Select.php
+++ b/packages/forms/src/Components/Select.php
@@ -782,7 +782,7 @@ class Select extends Field implements Contracts\CanDisableOptions, Contracts\Has
 
             if (isset($baseRelationshipQuery->limit)) {
                 $component->optionsLimit($baseRelationshipQuery->limit);
-            } elseif ($component->isSearchable()) {
+            } elseif ($component->isSearchable() && filled($component->getSearchColumns())) {
                 $relationshipQuery->limit($component->getOptionsLimit());
             }
 
@@ -1215,6 +1215,10 @@ class Select extends Field implements Contracts\CanDisableOptions, Contracts\Has
 
     public function hasDynamicSearchResults(): bool
     {
+        if ($this->hasRelationship() && blank($this->getRelationshipTitleAttribute()) && empty($this->searchColumns)) {
+            return false;
+        }
+
         return $this->getSearchResultsUsing instanceof Closure;
     }