diff --git a/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.tsx b/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.tsx
index eb127cda..d6d78e73 100644
--- a/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.tsx
+++ b/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-form.tsx
@@ -224,7 +224,7 @@ export const ChannelForm = ({onSuccessAction, organization, defaultValues, kind}
 
             <div className="flex justify-between mt-4">
                 <div>
-                    {kind == "storage" && (
+                    {(!isCreate || kind == "storage") && (
                         <ChannelTestButton
                             kind={kind}
                             organizationId={organization?.id}
diff --git a/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-test-button.tsx b/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-test-button.tsx
index fe745dbc..bb4c495d 100644
--- a/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-test-button.tsx
+++ b/src/components/wrappers/dashboard/admin/channels/channel/channel-form/channel-test-button.tsx
@@ -34,7 +34,7 @@ export const ChannelTestButton = ({channel, organizationId, kind}: NotifierTestC
                     message: `We are testing channel ${channel.name}`,
                     level: 'info',
                 };
-                const result = await dispatchNotification(payload, undefined, channel, organizationId);
+                const result = await dispatchNotification(payload, undefined, channel.id, organizationId);
 
                 if (result.success) {
                     toast.success(result.message);