diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
index e36d6f32e3..98d125ab8d 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerService.ts
@@ -27,7 +27,13 @@ export class DataViewerService {
   ) {}
 
   isDataEditable(connection: Connection) {
+    const isAdmin = this.sessionPermissionsResource.has(EAdminPermission.admin);
     const disabled = this.dataViewerSettingsService.settings.getValue('disableEdit');
-    return !disabled && !connection.readOnly;
+
+    if (disabled) {
+      return isAdmin;
+    }
+
+    return !connection.readOnly;
   }
 }