diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff993e86..34ad1e1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### [0.9.6] - [2022-06-01]
+
+* Fixed Type checking against concrete class instead of interface
+
 ### [0.9.5] - [2022-05-26]
 
 * Move away from deprecated class ConsumerRecordFactory (to prepare migration to Kafka Streams 3.2.0)
diff --git a/src/jackdaw/client.clj b/src/jackdaw/client.clj
index bc5d08bc..a50e10d9 100644
--- a/src/jackdaw/client.clj
+++ b/src/jackdaw/client.clj
@@ -155,11 +155,11 @@
   metadata about the partitions assigned to the given consumer or
   producer."
   [producer-or-consumer {:keys [^String topic-name]}]
-  (->> (cond (instance? KafkaConsumer producer-or-consumer)
-             (.partitionsFor ^KafkaConsumer producer-or-consumer topic-name)
+  (->> (cond (instance? Consumer producer-or-consumer)
+             (.partitionsFor ^Consumer producer-or-consumer topic-name)
 
-             (instance? KafkaProducer producer-or-consumer)
-             (.partitionsFor ^KafkaProducer producer-or-consumer topic-name)
+             (instance? Producer producer-or-consumer)
+             (.partitionsFor ^Producer producer-or-consumer topic-name)
 
              :else (throw (ex-info "Got non producer/consumer!"
                                    {:inst producer-or-consumer