diff --git a/metrics4j/src/main/java/org/kairosdb/metrics4j/internal/CollectorContainer.java b/metrics4j/src/main/java/org/kairosdb/metrics4j/internal/CollectorContainer.java
index be1a8c3..cf14e03 100644
--- a/metrics4j/src/main/java/org/kairosdb/metrics4j/internal/CollectorContainer.java
+++ b/metrics4j/src/main/java/org/kairosdb/metrics4j/internal/CollectorContainer.java
@@ -56,7 +56,7 @@ private void formatAndSink(ReportedMetric metric)
 	{
 		for (SinkQueue sinkQueue : m_sinkQueueList)
 		{
-			Formatter formatter = m_formatters.getOrDefault(sinkQueue.getSinkName(), sinkQueue.getSink().getDefaultFormatter());
+			Formatter formatter = m_formatters.computeIfAbsent(sinkQueue.getSinkName(), (sq) -> sinkQueue.getSink().getDefaultFormatter());
 
 			FormattedMetric formattedMetric = new FormattedMetric(metric, m_props, m_tags, m_help);
 
diff --git a/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java b/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java
index e385fc7..cbb5872 100644
--- a/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java
+++ b/metrics4j/src/test/java/org/kairosdb/metrics4j/configuration/MetricConfigTest.java
@@ -121,7 +121,6 @@ public void testDoubleCollectors()
 		ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class);
 
 		verify(m_sink1).reportMetrics(captor.capture());
-		verify(m_sink1).getDefaultFormatter();
 		verifyNoMoreInteractions(m_sink1);
 
 		assertThat(captor.getValue().get(0)).isEqualTo(formattedMetric);