diff --git a/resources/scripts/components/server/files/RenameFileModal.tsx b/resources/scripts/components/server/files/RenameFileModal.tsx
index 155b45e9b..8ecbc9d91 100644
--- a/resources/scripts/components/server/files/RenameFileModal.tsx
+++ b/resources/scripts/components/server/files/RenameFileModal.tsx
@@ -9,23 +9,22 @@ import tw from 'twin.macro';
 import Button from '@/components/elements/Button';
 import useServer from '@/plugins/useServer';
 import useFileManagerSwr from '@/plugins/useFileManagerSwr';
-import useFlash from '@/plugins/useFlash';
+import withFlash, { WithFlashProps } from '@/hoc/withFlash';
 
 interface FormikValues {
     name: string;
 }
 
-type Props = RequiredModalProps & { files: string[]; useMoveTerminology?: boolean };
+type OwnProps = WithFlashProps & RequiredModalProps & { files: string[]; useMoveTerminology?: boolean };
 
-export default ({ files, useMoveTerminology, ...props }: Props) => {
+const RenameFileModal = ({ flash, files, useMoveTerminology, ...props }: OwnProps) => {
     const { uuid } = useServer();
     const { mutate } = useFileManagerSwr();
-    const { clearFlashes, clearAndAddHttpError } = useFlash();
     const directory = ServerContext.useStoreState(state => state.files.directory);
     const setSelectedFiles = ServerContext.useStoreActions(actions => actions.files.setSelectedFiles);
 
     const submit = ({ name }: FormikValues, { setSubmitting }: FormikHelpers<FormikValues>) => {
-        clearFlashes('files');
+        flash.clearFlashes('files');
 
         const len = name.split('/').length;
         if (files.length === 1) {
@@ -51,7 +50,7 @@ export default ({ files, useMoveTerminology, ...props }: Props) => {
             .catch(error => {
                 mutate();
                 setSubmitting(false);
-                clearAndAddHttpError({ key: 'files', error });
+                flash.clearAndAddHttpError({ key: 'files', error });
             })
             .then(() => props.onDismissed());
     };
@@ -96,3 +95,5 @@ export default ({ files, useMoveTerminology, ...props }: Props) => {
         </Formik>
     );
 };
+
+export default withFlash(RenameFileModal);
diff --git a/resources/scripts/hoc/withFlash.tsx b/resources/scripts/hoc/withFlash.tsx
new file mode 100644
index 000000000..4a3f008f4
--- /dev/null
+++ b/resources/scripts/hoc/withFlash.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import useFlash from '@/plugins/useFlash';
+import { Actions } from 'easy-peasy';
+import { ApplicationStore } from '@/state';
+
+export interface WithFlashProps {
+    flash: Actions<ApplicationStore>['flashes'];
+}
+
+function withFlash<TOwnProps> (Component: React.ComponentType<TOwnProps & WithFlashProps>): React.ComponentType<TOwnProps> {
+    return (props: TOwnProps) => {
+        const { addError, addFlash, clearFlashes, clearAndAddHttpError } = useFlash();
+
+        return (
+            <Component
+                flash={{ addError, addFlash, clearFlashes, clearAndAddHttpError }}
+                {...props}
+            />
+        );
+    };
+}
+
+export default withFlash;