diff --git a/packages/web/lib/networking/queries/useGetWebhookQuery.tsx b/packages/web/lib/networking/queries/useGetWebhookQuery.tsx
index b04a76934..e5e05a6d2 100644
--- a/packages/web/lib/networking/queries/useGetWebhookQuery.tsx
+++ b/packages/web/lib/networking/queries/useGetWebhookQuery.tsx
@@ -18,10 +18,6 @@ interface WebhookData {
 }
 
 export function useGetWebhookQuery(id: string): WebhookQueryResponse {
-  if (!id) {
-    return {}
-  }
-
   const query = gql`
     query GetWebhook($id: ID!) {
       webhook(id: $id) {
diff --git a/packages/web/pages/settings/webhooks.tsx b/packages/web/pages/settings/webhooks.tsx
index 0c4fa1128..986a10754 100644
--- a/packages/web/pages/settings/webhooks.tsx
+++ b/packages/web/pages/settings/webhooks.tsx
@@ -24,7 +24,7 @@ export default function Webhooks(): JSX.Element {
     'PAGE_CREATED',
     'HIGHLIGHT_CREATED',
   ])
-  const [enabled, setEnabled] = useState(true)
+  const [enabled, setEnabled] = useState(false)
   const [formInputs, setFormInputs] = useState<FormInputProps[]>([
     {
       label: 'URL',
@@ -61,7 +61,7 @@ export default function Webhooks(): JSX.Element {
           label: 'Event Types',
           name: 'eventTypes',
           disabled: true,
-          value: eventTypes.join(', '),
+          value: webhook.eventTypes.join(', '),
         },
         {
           label: 'Enabled',
@@ -102,7 +102,7 @@ export default function Webhooks(): JSX.Element {
       id: onEditId,
       url,
       eventTypes,
-      enabled: enabled || false,
+      enabled: enabled,
     })
     if (result) {
       showSuccessToast('Updated', { position: 'bottom-right' })