diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 01664c6a0a34a..b2779f3da4ec3 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -706,7 +706,7 @@ public function createShare(IShare $share) {
 			// Generate the target
 			$defaultShareFolder = $this->config->getSystemValue('share_folder', '/');
 			$allowCustomShareFolder = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
-			if ($allowCustomShareFolder) {
+			if ($share->getShareType() === IShare::TYPE_USER && $allowCustomShareFolder) {
 				$shareFolder = $this->config->getUserValue($share->getSharedWith(), Application::APP_ID, 'share_folder', $defaultShareFolder);
 			} else {
 				$shareFolder = $defaultShareFolder;