diff --git a/gradle/changelog/hg_logger.yaml b/gradle/changelog/hg_logger.yaml
new file mode 100644
index 0000000000..a41b1e965f
--- /dev/null
+++ b/gradle/changelog/hg_logger.yaml
@@ -0,0 +1,2 @@
+- type: Fixed
+  description: Use correct logger for mercurial internal commands ([#1804](https://github.com/scm-manager/scm-manager/pull/1804))
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactoryBinder.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactoryBinder.java
new file mode 100644
index 0000000000..5409b59c3f
--- /dev/null
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactoryBinder.java
@@ -0,0 +1,45 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.log;
+
+import com.aragost.javahg.log.LoggerFactory;
+import sonia.scm.plugin.Extension;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+@Extension
+public class HgLoggerFactoryBinder implements ServletContextListener {
+  @Override
+  public void contextInitialized(ServletContextEvent servletContextEvent) {
+    // Set our own LoggerFactory to prevent usage of javahg fallback JULLogger
+    System.setProperty(LoggerFactory.class.getName(), HgLoggerFactory.class.getName());
+  }
+
+  @Override
+  public void contextDestroyed(ServletContextEvent servletContextEvent) {
+    // Do nothing
+  }
+}