diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index c52c766b48a..e3c955e88d2 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 /**
  * @author Joachim Bauch <mail@joachim-bauch.de>
+ * @copyright Copyright (c) 2022 Informatyka Boguslawski sp. z o.o. sp.k., http://www.ib.pl/
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -167,7 +168,10 @@ public function boot(IBootContext $context): void {
 		CommandListener::register($dispatcher);
 		CollaboratorsListener::register($dispatcher);
 		ResourceListener::register($dispatcher);
-		ChangelogListener::register($dispatcher);
+		// Register only when Talk Updates are not disabled
+		if ($server->getConfig()->getAppValue('spreed', 'changelog', 'yes') === 'yes') {
+			ChangelogListener::register($dispatcher);
+		}
 		ShareListener::register($dispatcher);
 		StatusListener::register($dispatcher);