diff --git a/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
index 8c5fd4e9cf3..1084dbf0eb2 100644
--- a/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
@@ -19,6 +19,10 @@
 import org.bson.codecs.Codec;
 import org.bson.codecs.configuration.CodecRegistry;
 
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.stream.Collectors;
+
 final class FallbackPropertyCodecProvider implements PropertyCodecProvider {
     private final CodecRegistry codecRegistry;
     private final PojoCodec<?> pojoCodec;
@@ -35,6 +39,10 @@ public <S> Codec<S> get(final TypeWithTypeParameters<S> type, final PropertyCode
         if (clazz == pojoCodec.getEncoderClass()) {
             return (Codec<S>) pojoCodec;
         }
+        List<Type> types = type.getTypeParameters().stream().<Type>map(TypeWithTypeParameters::getType).collect(Collectors.toList());
+        if (!types.isEmpty()) {
+            return codecRegistry.get(type.getType(), types);
+        }
         return codecRegistry.get(type.getType());
     }
 }
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecCyclicalLookupTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecCyclicalLookupTest.java
index 161a54fd902..0d1ad79df96 100644
--- a/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecCyclicalLookupTest.java
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecCyclicalLookupTest.java
@@ -31,6 +31,7 @@
 import org.bson.codecs.pojo.entities.SimpleModel;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -136,9 +137,19 @@ static class LookupCountingCodecRegistry implements CodecRegistry {
 
         @Override
         public <T> Codec<T> get(final Class<T> clazz) {
+            return get(clazz, this);
+        }
+
+        @Override
+        public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments) {
+            return get(clazz, typeArguments, this);
+        }
+
+        @Override
+        public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             incrementCount(clazz);
             for (CodecProvider provider : codecProviders) {
-                Codec<T> codec = provider.get(clazz, this);
+                Codec<T> codec = provider.get(clazz, registry);
                 if (codec != null) {
                     return codec;
                 }
@@ -146,10 +157,11 @@ public <T> Codec<T> get(final Class<T> clazz) {
             return null;
         }
 
-        public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        @Override
+        public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments, final CodecRegistry registry) {
             incrementCount(clazz);
             for (CodecProvider provider : codecProviders) {
-                Codec<T> codec = provider.get(clazz, registry);
+                Codec<T> codec = provider.get(clazz, typeArguments, registry);
                 if (codec != null) {
                     return codec;
                 }