diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 631f74d77..a353ca2fd 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -312,6 +312,10 @@ public function getAppValue($key) {
 			$defaultValue = $this->defaults[$key];
 		}
 
+		if ($this->config->getSystemValue('circles.' . $key, '') !== '') {
+			return $this->config->getSystemValue('circles.' . $key);
+		}
+
 		return $this->config->getAppValue($this->appName, $key, $defaultValue);
 	}