To be compatible with React Server Components

@Ephem we'd need to decide if this can go into v4 or if we also do this for v5