diff --git a/src/server/constants.ts b/src/server/constants.ts
index 731ca117..8e6a1508 100644
--- a/src/server/constants.ts
+++ b/src/server/constants.ts
@@ -45,6 +45,7 @@ export const GENERATE_TYPES_DEFAULT_SCHEMA =
   process.env.PG_META_GENERATE_TYPES_DEFAULT_SCHEMA || 'public'
 export const GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS =
   process.env.PG_META_GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS === 'true'
+export const POSTGREST_VERSION = process.env.PG_META_POSTGREST_VERSION
 export const GENERATE_TYPES_SWIFT_ACCESS_CONTROL = process.env
   .PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL
   ? (process.env.PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL as AccessControl)
diff --git a/src/server/routes/generators/typescript.ts b/src/server/routes/generators/typescript.ts
index 3e615b32..259cd141 100644
--- a/src/server/routes/generators/typescript.ts
+++ b/src/server/routes/generators/typescript.ts
@@ -11,6 +11,7 @@ export default async (fastify: FastifyInstance) => {
       excluded_schemas?: string
       included_schemas?: string
       detect_one_to_one_relationships?: string
+      postgrest_version?: string
     }
   }>('/', async (request, reply) => {
     const config = createConnectionConfig(request)
@@ -19,6 +20,7 @@ export default async (fastify: FastifyInstance) => {
     const includedSchemas =
       request.query.included_schemas?.split(',').map((schema) => schema.trim()) ?? []
     const detectOneToOneRelationships = request.query.detect_one_to_one_relationships === 'true'
+    const postgrestVersion = request.query.postgrest_version
 
     const pgMeta: PostgresMeta = new PostgresMeta(config)
     const { data: generatorMeta, error: generatorMetaError } = await getGeneratorMetadata(pgMeta, {
@@ -34,6 +36,7 @@ export default async (fastify: FastifyInstance) => {
     return applyTypescriptTemplate({
       ...generatorMeta,
       detectOneToOneRelationships,
+      postgrestVersion,
     })
   })
 }
diff --git a/src/server/server.ts b/src/server/server.ts
index 5396f9e0..9ac3152e 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -13,6 +13,7 @@ import {
   PG_CONNECTION,
   PG_META_HOST,
   PG_META_PORT,
+  POSTGREST_VERSION,
 } from './constants.js'
 import { apply as applyTypescriptTemplate } from './templates/typescript.js'
 import { apply as applyGoTemplate } from './templates/go.js'
@@ -129,6 +130,7 @@ async function getTypeOutput(): Promise<string | null> {
     ),
     types: types!,
     detectOneToOneRelationships: GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS,
+    postgresVersion: POSTGREST_VERSION,
   }
 
   switch (GENERATE_TYPES?.toLowerCase()) {
diff --git a/src/server/templates/typescript.ts b/src/server/templates/typescript.ts
index 6e3fc750..5ebe9dc8 100644
--- a/src/server/templates/typescript.ts
+++ b/src/server/templates/typescript.ts
@@ -21,8 +21,10 @@ export const apply = async ({
   functions,
   types,
   detectOneToOneRelationships,
+  postgrestVersion,
 }: GeneratorMetadata & {
   detectOneToOneRelationships: boolean
+  postgrestVersion?: string
 }): Promise<string> => {
   const columnsByTableId = Object.fromEntries<PostgresColumn[]>(
     [...tables, ...foreignTables, ...views, ...materializedViews].map((t) => [t.id, []])
@@ -32,6 +34,29 @@ export const apply = async ({
     .sort(({ name: a }, { name: b }) => a.localeCompare(b))
     .forEach((c) => columnsByTableId[c.table_id].push(c))
 
+  const internal_supabase_schema = postgrestVersion
+    ? `// Allows to automatically instanciate createClient with right options
+  // instead of createClient<Database, { postgrestVersion: 'XX' }>(URL, KEY)
+  __internal_supabase: {
+    postgrestVersion: '${postgrestVersion}'
+    Tables: {
+      [_ in never]: never
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      [_ in never]: never
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }`
+    : ''
+
   let output = `
 export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[]
 
@@ -431,6 +456,7 @@ export type Database = {
           }
         }`
     })}
+  ${internal_supabase_schema}
 }
 
 type DefaultSchema = Database[Extract<keyof Database, ${JSON.stringify(GENERATE_TYPES_DEFAULT_SCHEMA)}>]
diff --git a/test/server/typegen.ts b/test/server/typegen.ts
index c0851ef1..9e534d78 100644
--- a/test/server/typegen.ts
+++ b/test/server/typegen.ts
@@ -1875,6 +1875,659 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
   )
 })
 
+test('typegen: typescript w/ postgrestVersion', async () => {
+  const { body } = await app.inject({
+    method: 'GET',
+    path: '/generators/typescript',
+    query: { detect_one_to_one_relationships: 'true', postgrest_version: '13' },
+  })
+  expect(body).toMatchInlineSnapshot(
+    `
+    "export type Json =
+      | string
+      | number
+      | boolean
+      | null
+      | { [key: string]: Json | undefined }
+      | Json[]
+
+    export type Database = {
+      public: {
+        Tables: {
+          category: {
+            Row: {
+              id: number
+              name: string
+            }
+            Insert: {
+              id?: number
+              name: string
+            }
+            Update: {
+              id?: number
+              name?: string
+            }
+            Relationships: []
+          }
+          empty: {
+            Row: {}
+            Insert: {}
+            Update: {}
+            Relationships: []
+          }
+          foreign_table: {
+            Row: {
+              id: number
+              name: string | null
+              status: Database["public"]["Enums"]["user_status"] | null
+            }
+            Insert: {
+              id: number
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Update: {
+              id?: number
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Relationships: []
+          }
+          memes: {
+            Row: {
+              category: number | null
+              created_at: string
+              id: number
+              metadata: Json | null
+              name: string
+              status: Database["public"]["Enums"]["meme_status"] | null
+            }
+            Insert: {
+              category?: number | null
+              created_at: string
+              id?: number
+              metadata?: Json | null
+              name: string
+              status?: Database["public"]["Enums"]["meme_status"] | null
+            }
+            Update: {
+              category?: number | null
+              created_at?: string
+              id?: number
+              metadata?: Json | null
+              name?: string
+              status?: Database["public"]["Enums"]["meme_status"] | null
+            }
+            Relationships: [
+              {
+                foreignKeyName: "memes_category_fkey"
+                columns: ["category"]
+                isOneToOne: false
+                referencedRelation: "category"
+                referencedColumns: ["id"]
+              },
+            ]
+          }
+          table_with_other_tables_row_type: {
+            Row: {
+              col1: Database["public"]["Tables"]["user_details"]["Row"] | null
+              col2: Database["public"]["Views"]["a_view"]["Row"] | null
+            }
+            Insert: {
+              col1?: Database["public"]["Tables"]["user_details"]["Row"] | null
+              col2?: Database["public"]["Views"]["a_view"]["Row"] | null
+            }
+            Update: {
+              col1?: Database["public"]["Tables"]["user_details"]["Row"] | null
+              col2?: Database["public"]["Views"]["a_view"]["Row"] | null
+            }
+            Relationships: []
+          }
+          table_with_primary_key_other_than_id: {
+            Row: {
+              name: string | null
+              other_id: number
+            }
+            Insert: {
+              name?: string | null
+              other_id?: number
+            }
+            Update: {
+              name?: string | null
+              other_id?: number
+            }
+            Relationships: []
+          }
+          todos: {
+            Row: {
+              details: string | null
+              id: number
+              "user-id": number
+              blurb: string | null
+              blurb_varchar: string | null
+              details_is_long: boolean | null
+              details_length: number | null
+              details_words: string[] | null
+            }
+            Insert: {
+              details?: string | null
+              id?: number
+              "user-id": number
+            }
+            Update: {
+              details?: string | null
+              id?: number
+              "user-id"?: number
+            }
+            Relationships: [
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "a_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["initial_id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["second_id"]
+              },
+            ]
+          }
+          user_details: {
+            Row: {
+              details: string | null
+              user_id: number
+            }
+            Insert: {
+              details?: string | null
+              user_id: number
+            }
+            Update: {
+              details?: string | null
+              user_id?: number
+            }
+            Relationships: [
+              {
+                foreignKeyName: "user_details_user_id_fkey"
+                columns: ["user_id"]
+                isOneToOne: true
+                referencedRelation: "a_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "user_details_user_id_fkey"
+                columns: ["user_id"]
+                isOneToOne: true
+                referencedRelation: "users"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "user_details_user_id_fkey"
+                columns: ["user_id"]
+                isOneToOne: true
+                referencedRelation: "users_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "user_details_user_id_fkey"
+                columns: ["user_id"]
+                isOneToOne: true
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["initial_id"]
+              },
+              {
+                foreignKeyName: "user_details_user_id_fkey"
+                columns: ["user_id"]
+                isOneToOne: true
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["second_id"]
+              },
+            ]
+          }
+          users: {
+            Row: {
+              id: number
+              name: string | null
+              status: Database["public"]["Enums"]["user_status"] | null
+            }
+            Insert: {
+              id?: number
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Update: {
+              id?: number
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Relationships: []
+          }
+          users_audit: {
+            Row: {
+              created_at: string | null
+              id: number
+              previous_value: Json | null
+              user_id: number | null
+            }
+            Insert: {
+              created_at?: string | null
+              id?: number
+              previous_value?: Json | null
+              user_id?: number | null
+            }
+            Update: {
+              created_at?: string | null
+              id?: number
+              previous_value?: Json | null
+              user_id?: number | null
+            }
+            Relationships: []
+          }
+        }
+        Views: {
+          a_view: {
+            Row: {
+              id: number | null
+            }
+            Insert: {
+              id?: number | null
+            }
+            Update: {
+              id?: number | null
+            }
+            Relationships: []
+          }
+          todos_matview: {
+            Row: {
+              details: string | null
+              id: number | null
+              "user-id": number | null
+            }
+            Relationships: [
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "a_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["initial_id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["second_id"]
+              },
+            ]
+          }
+          todos_view: {
+            Row: {
+              details: string | null
+              id: number | null
+              "user-id": number | null
+            }
+            Insert: {
+              details?: string | null
+              id?: number | null
+              "user-id"?: number | null
+            }
+            Update: {
+              details?: string | null
+              id?: number | null
+              "user-id"?: number | null
+            }
+            Relationships: [
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "a_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view"
+                referencedColumns: ["id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["initial_id"]
+              },
+              {
+                foreignKeyName: "todos_user-id_fkey"
+                columns: ["user-id"]
+                isOneToOne: false
+                referencedRelation: "users_view_with_multiple_refs_to_users"
+                referencedColumns: ["second_id"]
+              },
+            ]
+          }
+          users_view: {
+            Row: {
+              id: number | null
+              name: string | null
+              status: Database["public"]["Enums"]["user_status"] | null
+            }
+            Insert: {
+              id?: number | null
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Update: {
+              id?: number | null
+              name?: string | null
+              status?: Database["public"]["Enums"]["user_status"] | null
+            }
+            Relationships: []
+          }
+          users_view_with_multiple_refs_to_users: {
+            Row: {
+              initial_id: number | null
+              initial_name: string | null
+              second_id: number | null
+              second_name: string | null
+            }
+            Relationships: []
+          }
+        }
+        Functions: {
+          blurb: {
+            Args: { "": Database["public"]["Tables"]["todos"]["Row"] }
+            Returns: string
+          }
+          blurb_varchar: {
+            Args: { "": Database["public"]["Tables"]["todos"]["Row"] }
+            Returns: string
+          }
+          details_is_long: {
+            Args: { "": Database["public"]["Tables"]["todos"]["Row"] }
+            Returns: boolean
+          }
+          details_length: {
+            Args: { "": Database["public"]["Tables"]["todos"]["Row"] }
+            Returns: number
+          }
+          details_words: {
+            Args: { "": Database["public"]["Tables"]["todos"]["Row"] }
+            Returns: string[]
+          }
+          function_returning_row: {
+            Args: Record<PropertyKey, never>
+            Returns: {
+              id: number
+              name: string | null
+              status: Database["public"]["Enums"]["user_status"] | null
+            }
+          }
+          function_returning_set_of_rows: {
+            Args: Record<PropertyKey, never>
+            Returns: {
+              id: number
+              name: string | null
+              status: Database["public"]["Enums"]["user_status"] | null
+            }[]
+          }
+          function_returning_table: {
+            Args: Record<PropertyKey, never>
+            Returns: {
+              id: number
+              name: string
+            }[]
+          }
+          get_todos_setof_rows: {
+            Args:
+              | { todo_row: Database["public"]["Tables"]["todos"]["Row"] }
+              | { user_row: Database["public"]["Tables"]["users"]["Row"] }
+            Returns: {
+              details: string | null
+              id: number
+              "user-id": number
+            }[]
+          }
+          get_user_audit_setof_single_row: {
+            Args: { user_row: Database["public"]["Tables"]["users"]["Row"] }
+            Returns: {
+              created_at: string | null
+              id: number
+              previous_value: Json | null
+              user_id: number | null
+            }[]
+          }
+          polymorphic_function: {
+            Args: { "": boolean } | { "": string }
+            Returns: undefined
+          }
+          postgres_fdw_disconnect: {
+            Args: { "": string }
+            Returns: boolean
+          }
+          postgres_fdw_disconnect_all: {
+            Args: Record<PropertyKey, never>
+            Returns: boolean
+          }
+          postgres_fdw_get_connections: {
+            Args: Record<PropertyKey, never>
+            Returns: Record<string, unknown>[]
+          }
+          postgres_fdw_handler: {
+            Args: Record<PropertyKey, never>
+            Returns: unknown
+          }
+          test_internal_query: {
+            Args: Record<PropertyKey, never>
+            Returns: undefined
+          }
+        }
+        Enums: {
+          meme_status: "new" | "old" | "retired"
+          user_status: "ACTIVE" | "INACTIVE"
+        }
+        CompositeTypes: {
+          composite_type_with_array_attribute: {
+            my_text_array: string[] | null
+          }
+          composite_type_with_record_attribute: {
+            todo: Database["public"]["Tables"]["todos"]["Row"] | null
+          }
+        }
+      }
+      // Allows to automatically instanciate createClient with right options
+      // instead of createClient<Database, { postgrestVersion: 'XX' }>(URL, KEY)
+      __internal_supabase: {
+        postgrestVersion: "13"
+        Tables: {
+          [_ in never]: never
+        }
+        Views: {
+          [_ in never]: never
+        }
+        Functions: {
+          [_ in never]: never
+        }
+        Enums: {
+          [_ in never]: never
+        }
+        CompositeTypes: {
+          [_ in never]: never
+        }
+      }
+    }
+
+    type DefaultSchema = Database[Extract<keyof Database, "public">]
+
+    export type Tables<
+      DefaultSchemaTableNameOrOptions extends
+        | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
+        | { schema: keyof Database },
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+            Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+        : never = never,
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+          Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+          Row: infer R
+        }
+        ? R
+        : never
+      : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])
+        ? (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
+            Row: infer R
+          }
+          ? R
+          : never
+        : never
+
+    export type TablesInsert<
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
+        | { schema: keyof Database },
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+        : never = never,
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+          Insert: infer I
+        }
+        ? I
+        : never
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+            Insert: infer I
+          }
+          ? I
+          : never
+        : never
+
+    export type TablesUpdate<
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
+        | { schema: keyof Database },
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+        : never = never,
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+          Update: infer U
+        }
+        ? U
+        : never
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+            Update: infer U
+          }
+          ? U
+          : never
+        : never
+
+    export type Enums<
+      DefaultSchemaEnumNameOrOptions extends
+        | keyof DefaultSchema["Enums"]
+        | { schema: keyof Database },
+      EnumName extends DefaultSchemaEnumNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
+        : never = never,
+    > = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+      : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+        ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
+        : never
+
+    export type CompositeTypes<
+      PublicCompositeTypeNameOrOptions extends
+        | keyof DefaultSchema["CompositeTypes"]
+        | { schema: keyof Database },
+      CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
+        : never = never,
+    > = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
+      ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
+      : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+        ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+        : never
+
+    export const Constants = {
+      public: {
+        Enums: {
+          meme_status: ["new", "old", "retired"],
+          user_status: ["ACTIVE", "INACTIVE"],
+        },
+      },
+    } as const
+    "
+  `
+  )
+})
+
 test('typegen: go', async () => {
   const { body } = await app.inject({ method: 'GET', path: '/generators/go' })
   expect(body).toMatchInlineSnapshot(`