diff --git a/plugins/org.jkiss.dbeaver.ext.athena/plugin.xml b/plugins/org.jkiss.dbeaver.ext.athena/plugin.xml
index f7fe1930d8e765ae92003122b3ebd8dae0ae24a6..47d8764da89c5cf32052c03791a9303b8f810b74 100644
--- a/plugins/org.jkiss.dbeaver.ext.athena/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.athena/plugin.xml
@@ -40,6 +40,7 @@
+
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
index 269ae7704b82a2702ecb97601aa2f46329624985..88feaee25f27dc1697466a47e5b0fd235b508baa 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
@@ -1800,6 +1800,10 @@ public class ResultSetViewer extends Viewer
@Override
public boolean isAllAttributesReadOnly() {
+ DBCExecutionContext executionContext = getExecutionContext();
+ if (executionContext != null && executionContext.getDataSource().getInfo().isReadOnlyData()) {
+ return true;
+ }
if (model.getAttributes().length == 0) {
return false;
}