diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php
index 96c762c9e4a42a01068270df810383bc57784715..d50fa7202f3c640eb208d898adc4dbab727d2f9d 100644
--- a/apps/federatedfilesharing/lib/Settings/Personal.php
+++ b/apps/federatedfilesharing/lib/Settings/Personal.php
@@ -80,6 +80,9 @@ class Personal implements ISettings {
 	 * @since 9.1
 	 */
 	public function getSection() {
+		if (!$this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
+			return null;
+		}
 		return 'sharing';
 	}
 
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 42ec16e223b72881c9849983c36b2e7f91103957..7281d7bf72e3bb24ce6de42268809e57bdbd9a24 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -171,6 +171,10 @@ class Manager implements IManager {
 				continue;
 			}
 
+			if ($setting->getSection() === null) {
+				continue;
+			}
+
 			if (!isset($this->settings[$settingsType][$setting->getSection()])) {
 				$this->settings[$settingsType][$setting->getSection()] = [];
 			}