diff --git a/packages/ui/src/shadcn/data-table.tsx b/packages/ui/src/shadcn/data-table.tsx
index b5af19e7f..deb7458ea 100644
--- a/packages/ui/src/shadcn/data-table.tsx
+++ b/packages/ui/src/shadcn/data-table.tsx
@@ -26,6 +26,9 @@ export function DataTable<TData, TValue>({
   columns,
   data,
 }: DataTableProps<TData, TValue>) {
+  // TODO: remove when https://github.com/TanStack/table/issues/5567 gets fixed
+  'use no memo';
+
   const table = useReactTable({
     data,
     columns,
diff --git a/packages/ui/src/shadcn/input.tsx b/packages/ui/src/shadcn/input.tsx
index 1bbba669f..de68d15a0 100644
--- a/packages/ui/src/shadcn/input.tsx
+++ b/packages/ui/src/shadcn/input.tsx
@@ -5,7 +5,7 @@ import { cn } from '../lib/utils';
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
+  ({ className, type = 'text', ...props }, ref) => {
     return (
       <input
         type={type}