diff --git a/frontend/src/common/components/GenericDocumentsPage.tsx b/frontend/src/common/components/GenericDocumentsPage.tsx
index 4c650fee5..d032686a3 100644
--- a/frontend/src/common/components/GenericDocumentsPage.tsx
+++ b/frontend/src/common/components/GenericDocumentsPage.tsx
@@ -1,5 +1,5 @@
 import {Button, Fieldset, IconArrowLeft, IconCrossCircle, IconDocument, IconPlus, StatusLabel} from "hds-react";
-import {useCallback, useRef, useState} from "react";
+import {useCallback, useState} from "react";
 import {SubmitHandler, useFieldArray, useForm, useFormContext} from "react-hook-form";
 import {IApartmentDetails, IHousingCompanyDetails} from "../schemas";
 import {FileInput, FormProviderForm, TextInput} from "./forms";
@@ -98,14 +98,12 @@ const DocumentRemoveLineButton = ({name, index, remove}) => {
 const DocumentsListItems = ({name, remove}) => {
     const formObject = useFormContext();
     const documents = formObject.watch(name);
-    const documentListItemRef = useRef(null);
     return (
         <>
             {documents.map((document, index) => (
                 <li
                     className="documents-list-item"
                     key={`document-item-${document.id ?? document.key}`}
-                    ref={documentListItemRef}
                 >
                     <TextInput
                         label="Nimi"
@@ -119,21 +117,6 @@ const DocumentsListItems = ({name, remove}) => {
                                 document.file_link || document.file_object ? "Vaihda tiedosto" : "Valitse tiedosto"
                             }
                             name={`${name}.${index}.file_object`}
-                            onChange={(filesArray) => {
-                                // File is a required field but the HDS file input clears the native input after selection so the form is always invalid.
-                                // This is a hack to make sure the native input has a file if the user has selected one so that the form can be submitted.
-                                const documentListItem = documentListItemRef.current as HTMLElement | null;
-                                const fileInput = documentListItem?.querySelector(
-                                    'input[type="file"]'
-                                ) as HTMLInputElement | null;
-                                if (fileInput) {
-                                    const datatransfer = new DataTransfer();
-                                    datatransfer.items.add(filesArray[0]);
-                                    setTimeout(() => (fileInput.files = datatransfer.files), 10);
-                                }
-                                // Explicitly mark as dirty, since react-hook-form does not support File objects for dirty checking.
-                                formObject.setValue(`${name}.${index}.file_object`, filesArray[0], {shouldDirty: true});
-                            }}
                             required={!document.file_link}
                             defaultValue={document.file_object ? [document.file_object] : []}
                         />
diff --git a/frontend/src/common/components/forms/FileInput.tsx b/frontend/src/common/components/forms/FileInput.tsx
index 7900c8423..3c27bfa63 100644
--- a/frontend/src/common/components/forms/FileInput.tsx
+++ b/frontend/src/common/components/forms/FileInput.tsx
@@ -1,6 +1,6 @@
 import {FileInput as HDSFileInput} from "hds-react";
 
-import React from "react";
+import React, {useRef} from "react";
 import {useFormContext} from "react-hook-form";
 import {FormInputProps} from "./";
 
@@ -10,6 +10,7 @@ interface FileInputProps extends FormInputProps {
 }
 const FileInput = ({name, label = "", required, onChange, ...rest}: FileInputProps): React.JSX.Element => {
     const formObject = useFormContext();
+    const containerRef = useRef(null);
 
     const {
         register,
@@ -17,15 +18,27 @@ const FileInput = ({name, label = "", required, onChange, ...rest}: FileInputPro
     } = formObject;
     register(name, {required: required});
 
-    const handleChange = (e) => {
-        // Set the value of the input to the file selected
-        formObject.setValue(name, e[0]);
+    const handleChange = (filesArray) => {
+        // File is a required field but the HDS file input clears the native input after selection so the form is always invalid.
+        // This is a hack to make sure the native input has a file if the user has selected one so that the form can be submitted.
+        const containerElement = containerRef.current as HTMLElement | null;
+        const fileInput = containerElement?.querySelector('input[type="file"]') as HTMLInputElement | null;
+        if (fileInput) {
+            const datatransfer = new DataTransfer();
+            datatransfer.items.add(filesArray[0]);
+            setTimeout(() => (fileInput.files = datatransfer.files), 10);
+        }
+        // Explicitly mark as dirty, since react-hook-form does not support File objects for dirty checking.
+        formObject.setValue(name, filesArray[0], {shouldDirty: true});
         // If there is an onChange handler, call it
-        onChange && onChange(e);
+        onChange && onChange(filesArray);
     };
 
     return (
-        <div className="input-field--file">
+        <div
+            ref={containerRef}
+            className="input-field--file"
+        >
             <HDSFileInput
                 id={name}
                 label={label}