diff --git a/config/config.sample.php b/config/config.sample.php
index 54d3d46070aa4..f7b63b1491fc8 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -2128,6 +2128,8 @@
 
 /**
  * Limit diagnostics event logging to events longer than the configured threshold in ms
+ *
+ * when set to 0 no diagnostics events will be logged
  */
 'diagnostics.logging.threshold' => 0,
 
diff --git a/lib/private/Diagnostics/EventLogger.php b/lib/private/Diagnostics/EventLogger.php
index c7b89002ea97d..7b9bd9630ab2c 100644
--- a/lib/private/Diagnostics/EventLogger.php
+++ b/lib/private/Diagnostics/EventLogger.php
@@ -126,7 +126,7 @@ private function writeLog(IEvent $event) {
 			$timeInMs = round($duration * 1000, 4);
 
 			$loggingMinimum = (int)$this->config->getValue('diagnostics.logging.threshold', 0);
-			if ($loggingMinimum > 0 && $timeInMs < $loggingMinimum) {
+			if ($loggingMinimum === 0 || $timeInMs < $loggingMinimum) {
 				return;
 			}