diff --git a/common/include/villas/log.hpp b/common/include/villas/log.hpp
index b68ccd2a9..41f212aea 100644
--- a/common/include/villas/log.hpp
+++ b/common/include/villas/log.hpp
@@ -81,8 +81,19 @@ public:
 
 	void addSink(std::shared_ptr<spdlog::sinks::sink> sink)
 	{
+		sink->set_formatter(formatter->clone());
+		sink->set_level(level);
+
 		sinks->add_sink(sink);
 	}
+
+	void replaceStdSink(std::shared_ptr<spdlog::sinks::sink> sink)
+	{
+		sink->set_formatter(formatter->clone());
+		sink->set_level(level);
+
+		sinks->sinks()[0] = sink;
+	}
 };
 
 } // namespace villas
diff --git a/common/lib/log.cpp b/common/lib/log.cpp
index 0d007bab4..d53c0a1c6 100644
--- a/common/lib/log.cpp
+++ b/common/lib/log.cpp
@@ -168,7 +168,6 @@ void Log::setFormatter(const std::string &pat, const std::string &pfx)
 	formatter->add_flag<CustomLevelFlag>('t');
 	formatter->set_pattern(prefix + pattern);
 
-	spdlog::set_formatter(formatter->clone());
 	sinks->set_formatter(formatter->clone());
 }
 
@@ -176,7 +175,6 @@ void Log::setLevel(Level lvl)
 {
 	level = lvl;
 
-	spdlog::set_level(lvl);
 	sinks->set_level(lvl);
 }