diff --git a/core-common/src/main/java/org/zalando/nakadi/repository/KafkaRepositoryCreator.java b/core-common/src/main/java/org/zalando/nakadi/repository/KafkaRepositoryCreator.java
index b96cf0ba13..b342a97447 100644
--- a/core-common/src/main/java/org/zalando/nakadi/repository/KafkaRepositoryCreator.java
+++ b/core-common/src/main/java/org/zalando/nakadi/repository/KafkaRepositoryCreator.java
@@ -64,7 +64,7 @@ public TopicRepository createTopicRepository(final Storage storage) throws Topic
                     zookeeperSettings.getZkConnectionTimeoutMs(),
                     nakadiSettings);
             final KafkaLocationManager kafkaLocationManager = new KafkaLocationManager(zooKeeperHolder, kafkaSettings);
-            final KafkaFactory kafkaFactory = new KafkaFactory(new KafkaLocationManager(zooKeeperHolder, kafkaSettings),
+            final KafkaFactory kafkaFactory = new KafkaFactory(kafkaLocationManager,
                     nakadiSettings.getKafkaActiveProducersCount());
             final KafkaZookeeper zk = new KafkaZookeeper(zooKeeperHolder, objectMapper);
             final KafkaTopicRepository kafkaTopicRepository =