diff --git a/scm-ui/ui-components/src/forms/InputField.tsx b/scm-ui/ui-components/src/forms/InputField.tsx
index b0027004fa..c5d4b0e606 100644
--- a/scm-ui/ui-components/src/forms/InputField.tsx
+++ b/scm-ui/ui-components/src/forms/InputField.tsx
@@ -21,7 +21,7 @@ import { createAttributesForTesting } from "../devBuild";
 import useAutofocus from "./useAutofocus";
 import { createFormFieldWrapper, FieldProps, FieldType, isLegacy, isUsingRef } from "./FormFieldTypes";
 import { createA11yId } from "../createA11yId";
-import FieldMessage from "@scm-manager/ui-core/src/base/forms/base/field-message/FieldMessage";
+import { FieldMessage } from "@scm-manager/ui-core";
 
 type BaseProps = {
   label?: string;
diff --git a/scm-ui/ui-core/src/base/forms/index.ts b/scm-ui/ui-core/src/base/forms/index.ts
index b15ad7905a..0ee36d79a2 100644
--- a/scm-ui/ui-core/src/base/forms/index.ts
+++ b/scm-ui/ui-core/src/base/forms/index.ts
@@ -36,6 +36,7 @@ import RadioButton from "./radio-button/RadioButton";
 import RadioGroupFieldComponent from "./radio-button/RadioGroupField";
 
 export { default as Field } from "./base/Field";
+export { default as FieldMessage } from "./base/field-message/FieldMessage";
 export { default as Checkbox } from "./checkbox/Checkbox";
 export { default as Combobox } from "./combobox/Combobox";
 export { default as ConfigurationForm } from "./ConfigurationForm";