diff --git a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
index 531b3b698..17e4bfdc8 100644
--- a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
+++ b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx
@@ -34,7 +34,7 @@ export interface SdmInfoRegFormProps {
 
 type FieldComponent = (
   field: ControllerRenderProps<SdmInfoFormData, keyof SdmInfoFormData>
-) => React.ReactElement;
+) => React.ReactElement<{ disabled?: boolean }>;
 
 export function SdmInfoRegForm({
   form,
diff --git a/apps/fo/app/store/index.tsx b/apps/fo/app/store/index.tsx
index bd684542b..f84bda1d1 100644
--- a/apps/fo/app/store/index.tsx
+++ b/apps/fo/app/store/index.tsx
@@ -7,9 +7,7 @@ import { type FoStore, StoreZus } from './store'
 
 export type StoreApi = ReturnType<typeof StoreZus>
 
-export const StoreContext = createContext<StoreApi | undefined>(
-  undefined,
-)
+export const StoreContext = createContext<StoreApi | null>(null);
 
 export interface StoreProviderProps {
   children: ReactNode
@@ -18,7 +16,7 @@ export interface StoreProviderProps {
 export const StoreProvider = ({
   children,
 }: StoreProviderProps) => {
-  const storeRef = useRef<StoreApi>()
+  const storeRef = useRef<StoreApi | null>(null);
   
   if (!storeRef.current) {
     const store = StoreZus()