diff --git a/redisinsight/api/src/modules/database/database.analytics.spec.ts b/redisinsight/api/src/modules/database/database.analytics.spec.ts
index 8851fcb441..9feb4a7723 100644
--- a/redisinsight/api/src/modules/database/database.analytics.spec.ts
+++ b/redisinsight/api/src/modules/database/database.analytics.spec.ts
@@ -187,7 +187,6 @@ describe('DatabaseAnalytics', () => {
       expect(sendEventSpy).toHaveBeenCalledWith(
         TelemetryEvents.RedisInstanceEditedByUser,
         {
-          host: cur.host,
           port: cur.port,
           databaseId: cur.id,
           connectionType: cur.connectionType,
@@ -225,7 +224,6 @@ describe('DatabaseAnalytics', () => {
       expect(sendEventSpy).toHaveBeenCalledWith(
         TelemetryEvents.RedisInstanceEditedByUser,
         {
-          host: cur.host,
           port: cur.port,
           databaseId: cur.id,
           connectionType: cur.connectionType,
diff --git a/redisinsight/api/src/modules/database/database.analytics.ts b/redisinsight/api/src/modules/database/database.analytics.ts
index b94549b7ee..f3df2316b1 100644
--- a/redisinsight/api/src/modules/database/database.analytics.ts
+++ b/redisinsight/api/src/modules/database/database.analytics.ts
@@ -87,7 +87,6 @@ export class DatabaseAnalytics extends TelemetryBaseService {
         this.sendEvent(
           TelemetryEvents.RedisInstanceEditedByUser,
           {
-            host: cur.host,
             port: cur.port,
             databaseId: cur.id,
             connectionType: cur.connectionType,
diff --git a/redisinsight/api/src/modules/database/database.service.spec.ts b/redisinsight/api/src/modules/database/database.service.spec.ts
index 37d4598c2e..5243917b45 100644
--- a/redisinsight/api/src/modules/database/database.service.spec.ts
+++ b/redisinsight/api/src/modules/database/database.service.spec.ts
@@ -112,7 +112,7 @@ describe('DatabaseService', () => {
     it('should update existing database and send analytics event', async () => {
       expect(await service.update(
         mockDatabase.id,
-        { password: 'password', port: 6380, host: '127.0.100.2' } as UpdateDatabaseDto,
+        { password: 'password', port: 6380 } as UpdateDatabaseDto,
         true,
       )).toEqual(mockDatabase);
       expect(analytics.sendInstanceEditedEvent).toHaveBeenCalledWith(
@@ -121,7 +121,6 @@ describe('DatabaseService', () => {
           ...mockDatabase,
           password: 'password',
           port: 6380,
-          host: '127.0.100.2',
         },
         true,
       );
diff --git a/redisinsight/ui/src/pages/home/HomePage.tsx b/redisinsight/ui/src/pages/home/HomePage.tsx
index 6f52dcf45f..112d151946 100644
--- a/redisinsight/ui/src/pages/home/HomePage.tsx
+++ b/redisinsight/ui/src/pages/home/HomePage.tsx
@@ -10,6 +10,10 @@ import {
 import { optimizeLSInstances, setTitle } from 'uiSrc/utils'
 import { PageHeader } from 'uiSrc/components'
 import { BrowserStorageItem } from 'uiSrc/constants'
+import { resetKeys } from 'uiSrc/slices/browser/keys'
+import { resetCliHelperSettings, resetCliSettingsAction } from 'uiSrc/slices/cli/cli-settings'
+import { resetRedisearchKeysData } from 'uiSrc/slices/browser/redisearch'
+import { appContextSelector, setAppContextInitialState } from 'uiSrc/slices/app/context'
 import { Instance } from 'uiSrc/slices/interfaces'
 import { cloudSelector, resetSubscriptionsRedisCloud } from 'uiSrc/slices/instances/cloud'
 import { editedInstanceSelector, fetchEditedInstanceAction, fetchInstancesAction, instancesSelector, setEditedInstance } from 'uiSrc/slices/instances/instances'
@@ -55,6 +59,8 @@ const HomePage = () => {
 
   const { identified: analyticsIdentified } = useSelector(appAnalyticsInfoSelector)
 
+  const { contextInstanceId } = useSelector(appContextSelector)
+
   !welcomeIsShow && setTitle('My Redis databases')
 
   useEffect(() => {
@@ -127,7 +133,15 @@ const HomePage = () => {
     }
   }, [instances])
 
-  const onInstanceChanged = () => ({})
+  const onDbEdited = () => {
+    if (contextInstanceId && contextInstanceId === editedInstance?.id) {
+      dispatch(resetKeys())
+      dispatch(resetRedisearchKeysData())
+      dispatch(resetCliSettingsAction())
+      dispatch(resetCliHelperSettings())
+      dispatch(setAppContextInitialState())
+    }
+  }
 
   const closeEditDialog = () => {
     dispatch(setEditedInstance(null))
@@ -245,7 +259,7 @@ const HomePage = () => {
                               isResizablePanel
                               editedInstance={editedInstance}
                               onClose={closeEditDialog}
-                              onDbAdded={onInstanceChanged}
+                              onDbEdited={onDbEdited}
                             />
                           )}
 
@@ -256,7 +270,6 @@ const HomePage = () => {
                               isResizablePanel
                               editedInstance={sentinelInstance ?? null}
                               onClose={handleClose}
-                              onDbAdded={onInstanceChanged}
                               isFullWidth={!instances.length}
                             />
                           )}
@@ -285,7 +298,6 @@ const HomePage = () => {
                           isResizablePanel
                           editedInstance={sentinelInstance ?? null}
                           onClose={handleClose}
-                          onDbAdded={onInstanceChanged}
                           isFullWidth={!instances.length}
                         />
                       )}
diff --git a/redisinsight/ui/src/pages/home/components/AddDatabases/AddDatabasesContainer.tsx b/redisinsight/ui/src/pages/home/components/AddDatabases/AddDatabasesContainer.tsx
index 08121fee24..a9ba7fe99d 100644
--- a/redisinsight/ui/src/pages/home/components/AddDatabases/AddDatabasesContainer.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddDatabases/AddDatabasesContainer.tsx
@@ -31,7 +31,6 @@ export interface Props {
   editMode: boolean;
   editedInstance: Nullable<Instance>;
   onClose?: () => void;
-  onDbAdded: () => void;
   onDbEdited?: () => void;
   onAliasEdited?: (value: string) => void;
   isFullWidth?: boolean;
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx
index 98cd9950d8..82b338c917 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx
@@ -136,39 +136,6 @@ describe('InstanceForm', () => {
     )
   })
 
-  it('should change host input properly', async () => {
-    const handleSubmit = jest.fn()
-    render(
-      <div id="footerDatabaseForm">
-        <InstanceForm
-          {...instance(mockedProps)}
-          isEditMode
-          formFields={{
-            ...formFields,
-            connectionType: ConnectionType.Sentinel,
-          }}
-          onSubmit={handleSubmit}
-        />
-      </div>
-    )
-
-    await act(() => {
-      fireEvent.change(screen.getByTestId('host'), {
-        target: { value: 'host_1' },
-      })
-    })
-
-    const submitBtn = screen.getByTestId(BTN_SUBMIT)
-    await act(() => {
-      fireEvent.click(submitBtn)
-    })
-    expect(handleSubmit).toBeCalledWith(
-      expect.objectContaining({
-        host: 'host_1',
-      })
-    )
-  })
-
   it('should change port input properly', async () => {
     const handleSubmit = jest.fn()
     render(
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DatabaseForm.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DatabaseForm.tsx
index f1e8d7ec87..e26635873b 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DatabaseForm.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DatabaseForm.tsx
@@ -80,8 +80,8 @@ const DatabaseForm = (props: Props) => {
 
   return (
     <>
-      {server?.buildType !== BuildType.RedisStack && (
-        <EuiFlexGroup className={flexGroupClassName}>
+      <EuiFlexGroup className={flexGroupClassName}>
+        {(!isEditMode || isCloneMode) && (
           <EuiFlexItem className={flexItemClassName}>
             <EuiFormRow label="Host*">
               <EuiFieldText
@@ -105,7 +105,8 @@ const DatabaseForm = (props: Props) => {
               />
             </EuiFormRow>
           </EuiFlexItem>
-
+        )}
+        {server?.buildType !== BuildType.RedisStack && (
           <EuiFlexItem className={flexItemClassName}>
             <EuiFormRow label="Port*" helpText="Should not exceed 65535.">
               <EuiFieldNumber
@@ -129,8 +130,8 @@ const DatabaseForm = (props: Props) => {
               />
             </EuiFormRow>
           </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
+        )}
+      </EuiFlexGroup>
 
       {(
         (!isEditMode || isCloneMode)
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DbInfo.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DbInfo.tsx
index 65169a4b43..1b2b709749 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DbInfo.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/DbInfo.tsx
@@ -82,33 +82,30 @@ const DbInfo = (props: Props) => {
           )}
         />
       )}
+      <EuiListGroupItem
+        label={(
+          <>
+            {!!nodes?.length && <AppendEndpoints />}
+            <EuiText color="subdued" size="s">
+              Host:
+              <EuiTextColor color="default" className={styles.dbInfoListValue}>
+                {host}
+              </EuiTextColor>
+            </EuiText>
+          </>
+        )}
+      />
       {server?.buildType === BuildType.RedisStack && (
-        <>
-          <EuiListGroupItem
-            label={(
-              <>
-                {!!nodes?.length && <AppendEndpoints />}
-                <EuiText color="subdued" size="s">
-                  Host:
-                  <EuiTextColor color="default" className={styles.dbInfoListValue}>
-                    {host}
-                  </EuiTextColor>
-                </EuiText>
-              </>
-            )}
-          />
-
-          <EuiListGroupItem
-            label={(
-              <EuiText color="subdued" size="s">
-                Port:
-                <EuiTextColor color="default" className={styles.dbInfoListValue}>
-                  {port}
-                </EuiTextColor>
-              </EuiText>
-            )}
-          />
-        </>
+        <EuiListGroupItem
+          label={(
+            <EuiText color="subdued" size="s">
+              Port:
+              <EuiTextColor color="default" className={styles.dbInfoListValue}>
+                {port}
+              </EuiTextColor>
+            </EuiText>
+          )}
+        />
       )}
 
       {!!db && (
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.spec.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.spec.tsx
index 62f193f8a7..4f574486d6 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.spec.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.spec.tsx
@@ -109,19 +109,6 @@ describe('InstanceFormWrapper', () => {
     expect(onClose).toBeCalled()
   })
 
-  it('should submit', () => {
-    const onSubmit = jest.fn()
-    render(
-      <InstanceFormWrapper
-        {...instance(mockedProps)}
-        editedInstance={mockedEditedInstance}
-        onDbAdded={onSubmit}
-      />
-    )
-    fireEvent.click(screen.getByTestId('submit-form-btn'))
-    expect(onSubmit).toBeCalled()
-  })
-
   it('should submit with editMode', () => {
     const component = render(
       <InstanceFormWrapper
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx
index 232700c547..fe2984bf31 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx
@@ -33,7 +33,6 @@ export interface Props {
   instanceType: InstanceType
   editMode: boolean
   editedInstance: Nullable<Instance>
-  onDbAdded: () => void
   onClose?: () => void
   onDbEdited?: () => void
   onAliasEdited?: (value: string) => void
@@ -77,7 +76,6 @@ const InstanceFormWrapper = (props: Props) => {
     instanceType,
     isResizablePanel = false,
     onClose,
-    onDbAdded,
     onDbEdited,
     onAliasEdited,
     editedInstance,
@@ -342,7 +340,6 @@ const InstanceFormWrapper = (props: Props) => {
       BrowserStorageItem.instancesCount,
       databasesCount + 1
     )
-    onDbAdded()
   }
 
   const handleConnectionFormSubmit = (values: DbConnectionInfo) => {
diff --git a/redisinsight/ui/src/pages/redisStack/components/edit-connection/EditConnection.tsx b/redisinsight/ui/src/pages/redisStack/components/edit-connection/EditConnection.tsx
index 0e5b2c1270..dea2c66625 100644
--- a/redisinsight/ui/src/pages/redisStack/components/edit-connection/EditConnection.tsx
+++ b/redisinsight/ui/src/pages/redisStack/components/edit-connection/EditConnection.tsx
@@ -123,7 +123,6 @@ const EditConnection = () => {
                     editMode
                     width={600}
                     editedInstance={state.data}
-                    onDbAdded={() => {}}
                     onDbEdited={onInstanceChanged}
                     onAliasEdited={onAliasChanged}
                     onClose={onClose}