diff --git a/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py b/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py
index d9e04a759..da5272f73 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/data_source/declarative_model/data_source.py
@@ -35,7 +35,7 @@ def _inject_base(self, credentials: dict[str, Any]) -> DeclarativeDataSources:
                     token = TokenCredentialsFromFile.token_from_file(credentials[data_source.id])
                     data_sources.append(data_source.to_api(token=token))
                 elif data_source.type == DATABRICKS_TYPE:
-                    if data_source.client_id is not None:
+                    if data_source.client_id and data_source.client_id.strip():
                         client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
                             credentials[data_source.id]
                         )
diff --git a/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py b/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py
index 920b9725b..1aa977d23 100644
--- a/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py
+++ b/gooddata-sdk/gooddata_sdk/catalog/data_source/service.py
@@ -476,7 +476,7 @@ def test_data_sources_connection(
                         declarative_data_source.to_test_request(token=token)
                     )
                 elif declarative_data_source.type == DATABRICKS_TYPE:
-                    if declarative_data_source.client_id is not None:
+                    if declarative_data_source.client_id and declarative_data_source.client_id.strip():
                         client_secret = ClientSecretCredentialsFromFile.client_secret_from_file(
                             credentials[declarative_data_source.id]
                         )