diff --git a/.changeset/nice-deers-dream.md b/.changeset/nice-deers-dream.md
new file mode 100644
index 0000000000..ba9ee3a49f
--- /dev/null
+++ b/.changeset/nice-deers-dream.md
@@ -0,0 +1,5 @@
+---
+"@blitzjs/next": patch
+---
+
+Export BlitzProvider from @blitzjs/next
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7263502f74..154aa21d5a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-* @beerose @dillonraphael
+* @flybayer @beerose @dillonraphael
 
 packages/generator/templates**/* @flybayer
diff --git a/packages/blitz-next/src/index-browser.tsx b/packages/blitz-next/src/index-browser.tsx
index af57e54f48..f88d482fd6 100644
--- a/packages/blitz-next/src/index-browser.tsx
+++ b/packages/blitz-next/src/index-browser.tsx
@@ -85,14 +85,14 @@ export type BlitzLayout<P = {}> = React.ComponentType<P> & {
 export type AppProps<P = {}> = AppPropsType<Router, P> & {
   Component: BlitzPage
 }
-const BlitzProvider = ({
-  client,
+export const BlitzProvider = ({
+  client = globalThis.queryClient,
   contextSharing = false,
   dehydratedState,
   hydrateOptions,
   children,
 }: BlitzProviderProps) => {
-  if (globalThis.queryClient) {
+  if (client) {
     return (
       <QueryClientProvider
         client={client || globalThis.queryClient}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 34eacf9945..96924de8da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,7 +48,7 @@ importers:
       "@types/node": 17.0.16
       "@types/preview-email": 2.0.1
       "@types/react": 18.0.1
-      blitz: workspace:2.0.0-alpha.51
+      blitz: workspace:2.0.0-alpha.52
       eslint: 7.32.0
       husky: 7.0.4
       jest: 27.5.1
@@ -469,8 +469,8 @@ importers:
 
   packages/blitz:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.51
-      "@blitzjs/generator": 2.0.0-alpha.51
+      "@blitzjs/config": workspace:2.0.0-alpha.52
+      "@blitzjs/generator": 2.0.0-alpha.52
       "@types/cookie": 0.4.1
       "@types/cross-spawn": 6.0.2
       "@types/debug": 4.1.7
@@ -576,7 +576,7 @@ importers:
 
   packages/blitz-auth:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.51
+      "@blitzjs/config": workspace:2.0.0-alpha.52
       "@testing-library/react": 13.0.0
       "@testing-library/react-hooks": 7.0.2
       "@types/b64-lite": 1.3.0
@@ -590,7 +590,7 @@ importers:
       "@types/secure-password": 3.1.1
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.51
+      blitz: 2.0.0-alpha.52
       cookie: 0.4.1
       cookie-session: 2.0.0
       debug: 4.3.3
@@ -641,8 +641,8 @@ importers:
 
   packages/blitz-next:
     specifiers:
-      "@blitzjs/config": workspace:2.0.0-alpha.51
-      "@blitzjs/rpc": 2.0.0-alpha.51
+      "@blitzjs/config": workspace:2.0.0-alpha.52
+      "@blitzjs/rpc": 2.0.0-alpha.52
       "@testing-library/dom": 8.13.0
       "@testing-library/jest-dom": 5.16.3
       "@testing-library/react": 13.0.0
@@ -653,7 +653,7 @@ importers:
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@types/testing-library__react-hooks": 4.0.0
-      blitz: 2.0.0-alpha.51
+      blitz: 2.0.0-alpha.52
       cross-spawn: 7.0.3
       debug: 4.3.3
       find-up: 4.1.0
@@ -702,14 +702,14 @@ importers:
 
   packages/blitz-rpc:
     specifiers:
-      "@blitzjs/auth": 2.0.0-alpha.51
-      "@blitzjs/config": workspace:2.0.0-alpha.51
+      "@blitzjs/auth": 2.0.0-alpha.52
+      "@blitzjs/config": workspace:2.0.0-alpha.52
       "@types/debug": 4.1.7
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       b64-lite: 1.4.0
       bad-behavior: 1.0.1
-      blitz: 2.0.0-alpha.51
+      blitz: 2.0.0-alpha.52
       chalk: ^4.1.0
       debug: 4.3.3
       next: 12.2.0
@@ -751,12 +751,12 @@ importers:
       "@babel/plugin-syntax-typescript": 7.17.12
       "@babel/preset-env": 7.12.10
       "@blitzjs/config": workspace:*
-      "@blitzjs/generator": 2.0.0-alpha.51
+      "@blitzjs/generator": 2.0.0-alpha.52
       "@types/jscodeshift": 0.11.2
       "@types/node": 17.0.16
       arg: 5.0.1
       ast-types: 0.14.2
-      blitz: 2.0.0-alpha.51
+      blitz: 2.0.0-alpha.52
       chalk: ^4.1.0
       cross-spawn: 7.0.3
       debug: 4.3.3
@@ -811,7 +811,7 @@ importers:
       "@babel/plugin-transform-typescript": 7.12.1
       "@babel/preset-env": 7.12.10
       "@babel/types": 7.12.10
-      "@blitzjs/config": 2.0.0-alpha.51
+      "@blitzjs/config": 2.0.0-alpha.52
       "@juanm04/cpx": 2.0.1
       "@mrleebo/prisma-ast": 0.2.6
       "@types/babel__core": 7.1.19
@@ -902,7 +902,7 @@ importers:
 
   packages/pkg-template:
     specifiers:
-      "@blitzjs/config": 2.0.0-alpha.51
+      "@blitzjs/config": 2.0.0-alpha.52
       "@types/react": 18.0.1
       "@types/react-dom": 17.0.14
       "@typescript-eslint/eslint-plugin": 5.9.1