diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
index e44617c98..e72e561a3 100644
--- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
+++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
@@ -367,19 +367,7 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 
 	private boolean isSerdeFromStandardDefaults(Serde<?> serde) {
 		if (serde != null) {
-			if (Serdes.Integer().getClass().isAssignableFrom(serde.getClass())) {
-				return true;
-			}
-			else if (Serdes.Long().getClass().isAssignableFrom(serde.getClass())) {
-				return true;
-			}
-			else if (Serdes.Short().getClass().isAssignableFrom(serde.getClass())) {
-				return true;
-			}
-			else if (Serdes.Double().getClass().isAssignableFrom(serde.getClass())) {
-				return true;
-			}
-			else if (Serdes.Float().getClass().isAssignableFrom(serde.getClass())) {
+			if (Number.class.isAssignableFrom(serde.getClass())) {
 				return true;
 			}
 			else if (Serdes.ByteArray().getClass().isAssignableFrom(serde.getClass())) {