diff --git a/packages/web/src/modals/ShowSqlModal.svelte b/packages/web/src/modals/ShowSqlModal.svelte
index b9b7dc05f..78fd71dfd 100644
--- a/packages/web/src/modals/ShowSqlModal.svelte
+++ b/packages/web/src/modals/ShowSqlModal.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang='ts'>
   import _ from 'lodash';
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import newQuery from '../query/newQuery';
@@ -6,6 +6,7 @@
 
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
+  import { _t } from '../translations';
 
   export let sql;
   export let onConfirm;
diff --git a/packages/web/src/query/MessageView.svelte b/packages/web/src/query/MessageView.svelte
index 9a70182ed..99c82d6bf 100644
--- a/packages/web/src/query/MessageView.svelte
+++ b/packages/web/src/query/MessageView.svelte
@@ -4,6 +4,8 @@
   import RowsFilterSwitcher from '../forms/RowsFilterSwitcher.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import { filterName } from 'dbgate-tools';
+  import InlineButton from '../buttons/InlineButton.svelte';
+  import FontIcon from '../icons/FontIcon.svelte';
 
   export let items: any[];
   export let showProcedure = false;
@@ -15,6 +17,7 @@
   export let engine = null;
 
   export let filter = '';
+  export let onClear = null;
 
   $: time0 = items[0] && new Date(items[0].time).getTime();
 
@@ -38,6 +41,17 @@
 
 <div class="main">
   <div class="topbar">
+    {#if onClear}
+      <InlineButton
+        icon="img clear"
+        on:click={() => {
+          onClear();
+        }}
+      >
+        <FontIcon icon="icon delete" padRight />
+        Clear
+      </InlineButton>
+    {/if}
     <RowsFilterSwitcher
       icon="img debug"
       label="Debug"
diff --git a/packages/web/src/query/SocketMessageView.svelte b/packages/web/src/query/SocketMessageView.svelte
index 808c74c0e..4bc6f7db5 100644
--- a/packages/web/src/query/SocketMessageView.svelte
+++ b/packages/web/src/query/SocketMessageView.svelte
@@ -12,7 +12,7 @@
   export let showLine = false;
   export let showCaller = false;
   export let eventName;
-  export let executeNumber;
+  export let executeNumber = null;
   export let showNoMessagesAlert = false;
   export let startLine = 0;
   export let onChangeErrors = null;
@@ -44,6 +44,11 @@
     return () => {};
   });
 
+  function handleClearMessages() {
+    cachedMessagesRef.set([]);
+    displayedMessages = [];
+  }
+
   $: {
     if (executeNumber >= 0) {
       displayedMessages = [];
@@ -81,5 +86,6 @@
     {startLine}
     {onExplainError}
     {engine}
+    onClear={executeNumber == null ? handleClearMessages : null}
   />
 {/if}
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index efbe32297..facb19f1a 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -771,7 +771,6 @@
               <SocketMessageView
                 eventName={sessionId ? `session-info-${sessionId}` : null}
                 onMessageClick={handleMesageClick}
-                {executeNumber}
                 startLine={executeStartLine}
                 showProcedure
                 showLine