diff --git a/packages/datalib/src/DataDuplicator.ts b/packages/datalib/src/DataDuplicator.ts
index 938591e6..92d083b9 100644
--- a/packages/datalib/src/DataDuplicator.ts
+++ b/packages/datalib/src/DataDuplicator.ts
@@ -255,7 +255,7 @@ export class DataDuplicator {
     } catch (err) {
       logger.error({ err }, 'Failed duplicator job, rollbacking');
       await runCommandOnDriver(this.pool, this.driver, dmp => dmp.rollbackTransaction());
-      throw err;
+      return;
     }
     if (this.options.rollbackAfterFinish) {
       logger.info('Rollbacking transaction, nothing was changed');
diff --git a/packages/web/src/tabs/DataDuplicatorTab.svelte b/packages/web/src/tabs/DataDuplicatorTab.svelte
index c97e9d34..e118f713 100644
--- a/packages/web/src/tabs/DataDuplicatorTab.svelte
+++ b/packages/web/src/tabs/DataDuplicatorTab.svelte
@@ -158,6 +158,7 @@
 
   const handleRunnerDone = () => {
     busy = false;
+    timerLabel.stop();
   };
 
   export function canKill() {
diff --git a/plugins/dbgate-plugin-postgres/src/frontend/drivers.js b/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
index 93aee6de..fa2f2bb9 100644
--- a/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/frontend/drivers.js
@@ -35,6 +35,7 @@ const dialect = {
   dropCheck: true,
 
   dropReferencesWhenDropTable: true,
+  requireStandaloneSelectForScopeIdentity: true,
 
   predefinedDataTypes: [
     'bigint',