diff --git a/src/main/java/io/r2dbc/postgresql/codec/BuiltinDynamicCodecs.java b/src/main/java/io/r2dbc/postgresql/codec/BuiltinDynamicCodecs.java
index 80131c8b..2cce4e03 100644
--- a/src/main/java/io/r2dbc/postgresql/codec/BuiltinDynamicCodecs.java
+++ b/src/main/java/io/r2dbc/postgresql/codec/BuiltinDynamicCodecs.java
@@ -119,7 +119,7 @@ public Publisher<Void> register(PostgresqlConnection connection, ByteBufAllocato
     }
 
     private PostgresqlStatement createQuery(PostgresqlConnection connection) {
-        return connection.createStatement(String.format("SELECT oid, typname, typarray FROM pg_catalog.pg_type WHERE typname IN (%s)", getPlaceholders()));
+        return connection.createStatement(String.format("SELECT * FROM pg_catalog.pg_type WHERE typname IN (%s)", getPlaceholders()));
     }
 
     private static String getPlaceholders() {
diff --git a/src/main/java/io/r2dbc/postgresql/codec/PostgresTypes.java b/src/main/java/io/r2dbc/postgresql/codec/PostgresTypes.java
index 5ded9b6e..e33c8bfb 100644
--- a/src/main/java/io/r2dbc/postgresql/codec/PostgresTypes.java
+++ b/src/main/java/io/r2dbc/postgresql/codec/PostgresTypes.java
@@ -40,7 +40,7 @@ public class PostgresTypes {
     public final static int NO_SUCH_TYPE = -1;
 
     // parameterized with %s for the comparator (=, IN), %s for the actual criteria value and %s for a potential LIMIT 1 statement
-    private static final String SELECT_PG_TYPE = "SELECT pg_type.oid, typarray, typname, typcategory "
+    private static final String SELECT_PG_TYPE = "SELECT pg_type.* "
         + "  FROM pg_catalog.pg_type "
         + "  LEFT "
         + "  JOIN (select ns.oid as nspoid, ns.nspname, r.r "