diff --git a/src/components/ComboBox.tsx b/src/components/ComboBox.tsx
index 44b47b77..db52949e 100644
--- a/src/components/ComboBox.tsx
+++ b/src/components/ComboBox.tsx
@@ -213,6 +213,10 @@ export function ComboBoxRenderFunction<T extends HTMLElement>(
     );
 }
 
-export const ComboBox = forwardRef<HTMLDivElement, ComboBoxProps<HTMLElement>>(ComboBoxRenderFunction);
+type CustomForwardRefResult = <T extends HTMLElement>(
+    props: React.PropsWithoutRef<ComboBoxProps<T>> & React.RefAttributes<HTMLDivElement>,
+) => React.ReactElement;
+
+export const ComboBox = forwardRef(ComboBoxRenderFunction) as CustomForwardRefResult;
 
 export default ComboBox;
diff --git a/src/components/FormMultiInput.tsx b/src/components/FormMultiInput.tsx
index d7e7cf32..f6299670 100644
--- a/src/components/FormMultiInput.tsx
+++ b/src/components/FormMultiInput.tsx
@@ -55,7 +55,7 @@ const StyledInput = styled(Input)`
     min-width: 100px;
 `;
 
-const StyledComboBox = styled(ComboBox)`
+const StyledComboBox = styled(ComboBox<HTMLButtonElement>)`
     margin-left: ${gapS};
 `;