diff --git a/package-lock.json b/package-lock.json
index f8a2d59..b755711 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "solid-trpc",
-  "version": "0.0.1-rc.1",
+  "version": "0.0.7-rc.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "solid-trpc",
-      "version": "0.0.1-rc.1",
+      "version": "0.0.7-rc.1",
       "license": "MIT",
       "devDependencies": {
         "@babel/core": "^7.18.13",
diff --git a/package.json b/package.json
index e436ee7..d76d9cd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "SolidJS tRPC",
   "author": "OrJDev",
   "license": "MIT",
-  "version": "0.0.7-rc.1",
+  "version": "0.0.8-rc.1",
   "publishConfig": {
     "access": "public",
     "tag": "next"
diff --git a/src/createTRPCSolid.ts b/src/createTRPCSolid.ts
index 3a492df..9f3d05c 100644
--- a/src/createTRPCSolid.ts
+++ b/src/createTRPCSolid.ts
@@ -32,6 +32,9 @@ import {
 } from "./shared/hooks/createHooksInternal";
 import { CreateTRPCSolidOptions } from "./shared/types";
 
+export type FixProcedureInput<T> = T extends void | undefined
+  ? void | undefined
+  : () => T;
 /**
  * @internal
  */
@@ -44,7 +47,7 @@ export type DecorateProcedure<
         TQueryFnData = inferProcedureOutput<TProcedure>,
         TData = inferProcedureOutput<TProcedure>
       >(
-        input: () => inferProcedureInput<TProcedure>,
+        input: FixProcedureInput<inferProcedureInput<TProcedure>>,
         opts?: UseTRPCQueryOptions<
           TPath,
           inferProcedureInput<TProcedure>,
@@ -59,7 +62,9 @@ export type DecorateProcedure<
             _TQueryFnData = inferProcedureOutput<TProcedure>,
             TData = inferProcedureOutput<TProcedure>
           >(
-            input: () => Omit<inferProcedureInput<TProcedure>, "cursor">,
+            input: FixProcedureInput<
+              Omit<inferProcedureInput<TProcedure>, "cursor">
+            >,
             opts?: UseTRPCInfiniteQueryOptions<
               TPath,
               inferProcedureInput<TProcedure>,
@@ -91,7 +96,7 @@ export type DecorateProcedure<
   : TProcedure extends AnySubscriptionProcedure
   ? {
       useSubscription: (
-        input: () => inferProcedureInput<TProcedure>,
+        input: FixProcedureInput<inferProcedureInput<TProcedure>>,
         opts?: UseTRPCSubscriptionOptions<
           inferObservableValue<inferProcedureOutput<TProcedure>>,
           TRPCClientErrorLike<TProcedure>