diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
index 76dde34d947..360bc5226aa 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
@@ -247,8 +247,8 @@ CREATE TABLE {table_prefix}CB_OBJECT_SETTINGS
     OBJECT_ID   VARCHAR(128) NOT NULL,
     OBJECT_TYPE VARCHAR(128) NOT NULL,
     SUBJECT_ID  VARCHAR(128) NOT NULL,
-    SETTING_ID  VARCHAR(128)  NOT NULL,
-    SETTING_VALUE VARCHAR(1024),
+    SETTING_ID  VARCHAR(255)  NOT NULL,
+    SETTING_VALUE TEXT,
 
     UPDATE_TIME  TIMESTAMP    NOT NULL,
     UPDATED_BY  VARCHAR(128) NOT NULL,
@@ -257,6 +257,7 @@ CREATE TABLE {table_prefix}CB_OBJECT_SETTINGS
     FOREIGN KEY (SUBJECT_ID) REFERENCES {table_prefix}CB_AUTH_SUBJECT(SUBJECT_ID) ON DELETE CASCADE
 );
 
+
 -- Secrets
 CREATE TABLE {table_prefix}CB_ACCESS_TOKEN
 (
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_28.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_28.sql
new file mode 100644
index 00000000000..1905bd6b390
--- /dev/null
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_28.sql
@@ -0,0 +1,17 @@
+DROP TABLE {table_prefix}CB_OBJECT_SETTINGS;
+
+CREATE TABLE {table_prefix}CB_OBJECT_SETTINGS
+(
+    PROJECT_ID  VARCHAR(128) NOT NULL,
+    OBJECT_ID   VARCHAR(128) NOT NULL,
+    OBJECT_TYPE VARCHAR(128) NOT NULL,
+    SUBJECT_ID  VARCHAR(128) NOT NULL,
+    SETTING_ID  VARCHAR(255)  NOT NULL,
+    SETTING_VALUE TEXT,
+
+    UPDATE_TIME  TIMESTAMP    NOT NULL,
+    UPDATED_BY  VARCHAR(128) NOT NULL,
+
+    PRIMARY KEY (PROJECT_ID, SUBJECT_ID, OBJECT_TYPE, OBJECT_ID, SETTING_ID),
+    FOREIGN KEY (SUBJECT_ID) REFERENCES {table_prefix}CB_AUTH_SUBJECT(SUBJECT_ID) ON DELETE CASCADE
+);
diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
index 9160dfbcb84..beaf982ab1b 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
@@ -72,7 +72,7 @@
 public class CBDatabase extends InternalDB<WebDatabaseConfig> {
     private static final Log log = Log.getLog(CBDatabase.class);
 
-    private static final int CURRENT_SCHEMA_VERSION = 27;
+    private static final int CURRENT_SCHEMA_VERSION = 28;
     private static final String SCHEMA_ID = "CB_CE";
 
     private static final SQLSchemaConfig SCHEMA_CREATE_CONFIG = new SQLSchemaConfig(