diff --git a/frontend/src/Editor/DataSourceManager/DataSourceManager.jsx b/frontend/src/Editor/DataSourceManager/DataSourceManager.jsx
index 17e84d1272..129d9930b5 100644
--- a/frontend/src/Editor/DataSourceManager/DataSourceManager.jsx
+++ b/frontend/src/Editor/DataSourceManager/DataSourceManager.jsx
@@ -270,7 +270,7 @@ class DataSourceManager extends React.Component {
                     ))}
                   </>
                 )}
-                {this.state.queryString && this.state.filteredDatasources.length === 0 && (
+                {!suggestingDatasources && this.state.queryString && this.state.filteredDatasources.length === 0 && (
                   <div className="empty-state-wrapper row">
                     <EmptyStateContainer
                       queryString={this.state.queryString}