diff --git a/src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java b/src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java
index 48520651..16e24074 100644
--- a/src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java
+++ b/src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java
@@ -244,7 +244,6 @@ private static List<Codec<?>> getDefaultCodecs(ByteBufAllocator byteBufAllocator
             new BigIntegerCodec(byteBufAllocator),
             new BooleanCodec(byteBufAllocator),
             new CharacterCodec(byteBufAllocator),
-            new DayOfWeekCodec(byteBufAllocator),
             new DoubleCodec(byteBufAllocator),
             new FloatCodec(byteBufAllocator),
             new InetAddressCodec(byteBufAllocator),
@@ -254,18 +253,19 @@ private static List<Codec<?>> getDefaultCodecs(ByteBufAllocator byteBufAllocator
             new LocalDateTimeCodec(byteBufAllocator, configuration::getZoneId),
             new LocalTimeCodec(byteBufAllocator),
             new LongCodec(byteBufAllocator),
-            new MonthCodec(byteBufAllocator),
-            new MonthDayCodec(byteBufAllocator),
             new OffsetDateTimeCodec(byteBufAllocator),
             new OffsetTimeCodec(byteBufAllocator),
-            new PeriodCodec(byteBufAllocator),
             new ShortCodec(byteBufAllocator),
             new UriCodec(byteBufAllocator),
             new UrlCodec(byteBufAllocator),
             new UuidCodec(byteBufAllocator),
+            new ZoneIdCodec(byteBufAllocator),
+            new DayOfWeekCodec(byteBufAllocator),
+            new MonthCodec(byteBufAllocator),
+            new MonthDayCodec(byteBufAllocator),
+            new PeriodCodec(byteBufAllocator),
             new YearCodec(byteBufAllocator),
             new YearMonthCodec(byteBufAllocator),
-            new ZoneIdCodec(byteBufAllocator),
 
             // JSON
             new JsonCodec(byteBufAllocator, preferAttachedBuffers),