diff --git a/app/javascript/src/components/Button/Button.tsx b/app/javascript/src/components/Button/Button.tsx
index ffb7609..9a0a754 100644
--- a/app/javascript/src/components/Button/Button.tsx
+++ b/app/javascript/src/components/Button/Button.tsx
@@ -39,4 +39,8 @@ const Component: React.ForwardRefRenderFunction<unknown, Props> = (props) => {
   );
 };
 
-export const Button = React.forwardRef<unknown, Props>(Component);
+export const Button = React.forwardRef<HTMLButtonElement, Props>(
+  (props, ref) => {
+    return <Component {...props} ref={ref} />;
+  }
+);
diff --git a/app/javascript/src/components/Input/Input.tsx b/app/javascript/src/components/Input/Input.tsx
index 526b53c..927465f 100644
--- a/app/javascript/src/components/Input/Input.tsx
+++ b/app/javascript/src/components/Input/Input.tsx
@@ -27,4 +27,6 @@ const Component: React.ForwardRefRenderFunction<unknown, Props> = (props) => {
   );
 };
 
-export const Input = React.forwardRef<unknown, Props>(Component);
+export const Input = React.forwardRef<HTMLInputElement, Props>((props, ref) => {
+  return <Component {...props} ref={ref} />;
+});