diff --git a/tavla/app/components/ContactForm.tsx b/tavla/app/components/ContactForm.tsx
index 767754348..8217fe336 100644
--- a/tavla/app/components/ContactForm.tsx
+++ b/tavla/app/components/ContactForm.tsx
@@ -1,5 +1,5 @@
 'use client'
-import { Checkbox, TextArea } from '@entur/form'
+import { Checkbox, TextArea, TextField } from '@entur/form'
 import { Label, Paragraph, SubParagraph } from '@entur/typography'
 import { SubmitButton } from 'components/Form/SubmitButton'
 import { postForm } from './actions'
@@ -15,7 +15,6 @@ import { Expandable } from './Expandable'
 import { usePostHog } from 'posthog-js/react'
 import { isEmptyOrSpaces } from 'app/(admin)/edit/utils'
 import { validEmail } from 'utils/email'
-import ClientOnlyTextField from './NoSSR/TextField'
 
 function ContactForm() {
     const posthog = usePostHog()
@@ -73,14 +72,6 @@ function ContactForm() {
                         med Tavla.
                     </Paragraph>
 
-                    <ClientOnlyTextField
-                        label="E-postadresse"
-                        name="email"
-                        id="email"
-                        aria-label="E-postadresse"
-                        {...getFormFeedbackForField('email', formState)}
-                    />
-
                     <div>
                         <Label
                             htmlFor="message"
@@ -107,7 +98,7 @@ function ContactForm() {
                         <Label htmlFor="email" className="font-bold">
                             E-post
                         </Label>
-                        <ClientOnlyTextField
+                        <TextField
                             label="E-postadresse"
                             name="email"
                             id="email"