diff --git a/frontend/app/components/Dashboard/components/Alerts/AlertForm/Condition.tsx b/frontend/app/components/Dashboard/components/Alerts/AlertForm/Condition.tsx
index 5039cc1dd..ba6956323 100644
--- a/frontend/app/components/Dashboard/components/Alerts/AlertForm/Condition.tsx
+++ b/frontend/app/components/Dashboard/components/Alerts/AlertForm/Condition.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Input } from 'UI';
 import Select from 'Shared/Select';
 import { alertConditions as conditions } from 'App/constants';
+import Alert from 'Types/alert'
 
 const thresholdOptions = [
   { label: '15 minutes', value: 15 },
diff --git a/frontend/app/mstore/alertsStore.ts b/frontend/app/mstore/alertsStore.ts
index e608c1873..a2d155ffc 100644
--- a/frontend/app/mstore/alertsStore.ts
+++ b/frontend/app/mstore/alertsStore.ts
@@ -20,7 +20,9 @@ export default class AlertsStore {
     this.page = 1;
   }
 
+  // TODO: remove it
   updateKey(key: string, value: any) {
+    // @ts-ignore
     this[key] = value
   }
 
@@ -77,10 +79,10 @@ export default class AlertsStore {
 
   edit = (diff: Partial<Alert>) => {
     const key = Object.keys(diff)[0]
-    const oldInst = this.instance
+    const oldInst = { ...this.instance }
     // @ts-ignore
     oldInst[key] = diff[key]
 
-    this.instance = oldInst
+    this.instance = new Alert(oldInst, !!oldInst.alertId)
   }
 }