diff --git a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
index 4f79ce9251..46ca3f080b 100644
--- a/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
+++ b/webapp/packages/plugin-data-viewer/src/ContainerDataSource.ts
@@ -46,7 +46,7 @@ export class ContainerDataSource extends DatabaseDataSource<IDataContainerOption
   }
 
   isDisabled(resultIndex: number): boolean {
-    return !this.getResult(resultIndex)?.data;
+    return !this.getResult(resultIndex)?.data && this.error === null;
   }
 
   cancel(): boolean {
diff --git a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
index 0a75170c98..f4867bc779 100644
--- a/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
+++ b/webapp/packages/plugin-sql-editor/src/QueryDataSource.ts
@@ -44,7 +44,7 @@ export class QueryDataSource extends DatabaseDataSource<IDataQueryOptions, IData
   }
 
   isDisabled(resultIndex: number): boolean {
-    return !this.getResult(resultIndex)?.data;
+    return !this.getResult(resultIndex)?.data && this.error === null;
   }
 
   cancel(): boolean {