diff --git a/Data_Coupler/Pages/DataCoupler.razor b/Data_Coupler/Pages/DataCoupler.razor
index aeb5630..0e0fa65 100644
--- a/Data_Coupler/Pages/DataCoupler.razor
+++ b/Data_Coupler/Pages/DataCoupler.razor
@@ -812,8 +812,11 @@
         </div>
     </div>    <!-- Sezione Mapping (quando la fonte è selezionata e REST è connesso) -->
     @{
-        var isSourceReady = (selectedSourceType == "database" && isDatabaseConnected && 
-                           ((useCustomQuery && isQueryValid) || (!useCustomQuery && !string.IsNullOrEmpty(selectedTable)))) ||
+        // Per ODBC: non richiede isDatabaseConnected, basta query validata
+        // Per altri database: richiede connessione + (query validata OR tabella selezionata)
+        var isSourceReady = (selectedSourceType == "database" && 
+                           ((IsOdbcConnection() && useCustomQuery && isQueryValid) || 
+                            (!IsOdbcConnection() && isDatabaseConnected && ((useCustomQuery && isQueryValid) || (!useCustomQuery && !string.IsNullOrEmpty(selectedTable)))))) ||
                            (selectedSourceType == "file" && !string.IsNullOrEmpty(selectedSheet));
     }
     @if (isSourceReady && isRestConnected && selectedRestEntity != null)