diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java b/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
index 9a2a6f08bc..01570b2caf 100644
--- a/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
+++ b/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
@@ -1088,16 +1088,16 @@ protected JsonSerializer<Object> _findExplicitUntypedSerializer(Class<?> runtime
             ser = _serializerCache.untypedValueSerializer(runtimeType);
             if (ser == null) {
                 ser = _createAndCacheUntypedSerializer(runtimeType);
-                /* 18-Sep-2014, tatu: This is unfortunate patch over related change
-                 *    that pushes creation of "unknown type" serializer deeper down
-                 *    in BeanSerializerFactory; as a result, we need to "undo" creation
-                 *    here.
-                 */
-                if (isUnknownTypeSerializer(ser)) {
-                    return null;
-                }
             }
         }
+        /* 18-Sep-2014, tatu: This is unfortunate patch over related change
+         *    that pushes creation of "unknown type" serializer deeper down
+         *    in BeanSerializerFactory; as a result, we need to "undo" creation
+         *    here.
+         */
+        if (isUnknownTypeSerializer(ser)) {
+            return null;
+        }
         return ser;
     }