diff --git a/packages/datalib/src/ChangeSet.ts b/packages/datalib/src/ChangeSet.ts
index d655d62ba..d0b2e0f37 100644
--- a/packages/datalib/src/ChangeSet.ts
+++ b/packages/datalib/src/ChangeSet.ts
@@ -313,19 +313,7 @@ export function extractChangeSetCondition(
   table?: TableInfo,
   dialect?: SqlDialect
 ): Condition {
-  function getShouldUseRawRightValue(columnName: string) {
-    if (!table || !dialect || !dialect.rawUuids) return false;
-
-    const column = table.columns.find(x => x.columnName == columnName);
-    if (!column) return false;
-
-    if (column.dataType !== 'uuid') return false;
-
-    return true;
-  }
-
   function getColumnCondition(columnName: string): Condition {
-    const shouldUseRawRightValue = getShouldUseRawRightValue(columnName);
     const dataType = table?.columns?.find(x => x.columnName == columnName)?.dataType;
 
     const value = item.condition[columnName];
@@ -352,16 +340,11 @@ export function extractChangeSetCondition(
         conditionType: 'binary',
         operator: '=',
         left: expr,
-        right: shouldUseRawRightValue
-          ? {
-              exprType: 'raw',
-              sql: value,
-            }
-          : {
-              exprType: 'value',
-              dataType,
-              value,
-            },
+        right: {
+          exprType: 'value',
+          dataType,
+          value,
+        },
       };
     }
   }
diff --git a/packages/types/dialect.d.ts b/packages/types/dialect.d.ts
index 97c9ba6f1..58c52ffe6 100644
--- a/packages/types/dialect.d.ts
+++ b/packages/types/dialect.d.ts
@@ -17,7 +17,6 @@ export interface SqlDialect {
   enableConstraintsPerTable?: boolean;
   requireStandaloneSelectForScopeIdentity?: boolean;
   allowMultipleValuesInsert?: boolean;
-  rawUuids?: boolean;
 
   dropColumnDependencies?: string[];
   changeColumnDependencies?: string[];
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 14dbf880e..64bf4782e 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -160,7 +160,7 @@
     const driver = findEngineDriver($connection, $extensions);
 
     const script = driver.createSaveChangeSetScript($changeSetStore?.value, $dbinfo, () =>
-      changeSetToSql($changeSetStore?.value, $dbinfo)
+      changeSetToSql($changeSetStore?.value, $dbinfo, driver.dialect)
     );
 
     const deleteCascades = getDeleteCascades($changeSetStore?.value, $dbinfo);
diff --git a/plugins/dbgate-plugin-cassandra/src/frontend/driver.js b/plugins/dbgate-plugin-cassandra/src/frontend/driver.js
index 68667e8cf..8752b9f1c 100644
--- a/plugins/dbgate-plugin-cassandra/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-cassandra/src/frontend/driver.js
@@ -7,7 +7,6 @@ const _cloneDeepWith = require('lodash/cloneDeepWith');
 const dialect = {
   limitSelect: true,
   rangeSelect: true,
-  rawUuids: true,
   stringEscapeChar: "'",
   fallbackDataType: 'varchar',
   offsetNotSupported: true,