diff --git a/grafana-plugin/src/components/IntegrationInputField/IntegrationInputField.tsx b/grafana-plugin/src/components/IntegrationInputField/IntegrationInputField.tsx
index f7087f87..3f3992ae 100644
--- a/grafana-plugin/src/components/IntegrationInputField/IntegrationInputField.tsx
+++ b/grafana-plugin/src/components/IntegrationInputField/IntegrationInputField.tsx
@@ -48,7 +48,7 @@ const IntegrationInputField: React.FC<IntegrationInputFieldProps> = ({
   );
 
   function renderInputField() {
-    return <Input className={cx('input')} value={isInputMasked ? value.replace(/./g, '*') : value} disabled />;
+    return <Input className={cx('input')} value={isInputMasked ? value?.replace(/./g, '*') : value} disabled />;
   }
 
   function onInputReveal() {
diff --git a/grafana-plugin/src/containers/IntegrationForm/IntegrationForm2.tsx b/grafana-plugin/src/containers/IntegrationForm/IntegrationForm2.tsx
index 28f095d7..d565ee50 100644
--- a/grafana-plugin/src/containers/IntegrationForm/IntegrationForm2.tsx
+++ b/grafana-plugin/src/containers/IntegrationForm/IntegrationForm2.tsx
@@ -60,7 +60,6 @@ const IntegrationForm2 = observer((props: IntegrationFormProps) => {
         ? alertReceiveChannelStore
             .create(data)
             .then((response) => {
-              onHide();
               history.push(`${PLUGIN_ROOT}/integrations_2/${response.id}`);
             })
             .catch(() => {