diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
index 92668eea..fc83bb06 100755
--- a/lib/Controller/ConfigController.php
+++ b/lib/Controller/ConfigController.php
@@ -192,7 +192,6 @@ class ConfigController extends Controller {
 				throw new InvalidArgumentException('Invalid key');
 			}
 		}
-		$openProjectGroupFolderFileId = null;
 
 		if (key_exists('setup_group_folder', $values) && $values['setup_group_folder']) {
 			$isSystemReady = $this->openprojectAPIService->isSystemReadyForGroupFolderSetUp();
@@ -202,7 +201,7 @@ class ConfigController extends Controller {
 				$group = $this->groupManager->createGroup(Application::OPEN_PROJECT_ENTITIES_NAME);
 				$group->addUser($user);
 				$this->subAdminManager->createSubAdmin($user, $group);
-				$openProjectGroupFolderFileId = $this->openprojectAPIService->createGroupfolder();
+				$this->openprojectAPIService->createGroupfolder();
 			}
 		}
 
@@ -311,8 +310,7 @@ class ConfigController extends Controller {
 		$this->config->deleteAppValue(Application::APP_ID, 'oPOAuthTokenRevokeStatus');
 		return [
 			"status" => OpenProjectAPIService::isAdminConfigOk($this->config),
-			"oPOAuthTokenRevokeStatus" => $oPOAuthTokenRevokeStatus,
-			"oPGroupFolderFileId" => $openProjectGroupFolderFileId
+			"oPOAuthTokenRevokeStatus" => $oPOAuthTokenRevokeStatus
 		];
 	}
 
@@ -524,9 +522,6 @@ class ConfigController extends Controller {
 			if ($status['oPOAuthTokenRevokeStatus'] !== '') {
 				$result['openproject_revocation_status'] = $status['oPOAuthTokenRevokeStatus'];
 			}
-			if ($status['oPGroupFolderFileId'] !== null) {
-				$result['openproject_groupfolder_id'] = $status['oPGroupFolderFileId'];
-			}
 			return new DataResponse($result);
 		} catch (OpenprojectGroupfolderSetupConflictException $e) {
 			return new DataResponse([
diff --git a/lib/Listener/BeforeNodeInsideOpenProjectGroupfilderChangedListener.php b/lib/Listener/BeforeNodeInsideOpenProjectGroupfilderChangedListener.php
index 5a777325..050ab927 100644
--- a/lib/Listener/BeforeNodeInsideOpenProjectGroupfilderChangedListener.php
+++ b/lib/Listener/BeforeNodeInsideOpenProjectGroupfilderChangedListener.php
@@ -10,7 +10,6 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
-use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IUserSession;
 
@@ -29,21 +28,15 @@ class BeforeNodeInsideOpenProjectGroupfilderChangedListener implements IEventLis
 	 * @var IUserSession
 	 */
 	private $userSession;
-	/**
-	 * @var IConfig
-	 */
-	private $config;
 
 	public function __construct(
 		OpenProjectAPIService $openprojectAPIService,
 		IUserSession $userSession,
-		IGroupManager $groupManager,
-		IConfig $config
+		IGroupManager $groupManager
 	) {
 		$this->openprojectAPIService = $openprojectAPIService;
 		$this->userSession = $userSession;
 		$this->groupManager = $groupManager;
-		$this->config = $config;
 	}
 
 	public function handle(Event $event): void {
@@ -57,10 +50,7 @@ class BeforeNodeInsideOpenProjectGroupfilderChangedListener implements IEventLis
 		$currentUserId = $this->userSession->getUser()->getUID();
 		if (
 			$this->openprojectAPIService->isProjectFoldersSetupComplete() &&
-			$parentNode->getId() === (int)$this->config->getAppValue(
-				Application::APP_ID,
-				'openproject_groupfolder_id',
-			) &&
+			preg_match('/.*\/files\/' .  Application::OPEN_PROJECT_ENTITIES_NAME . '$/', $parentNode->getPath()) === 1 &&
 			$currentUserId !== Application::OPEN_PROJECT_ENTITIES_NAME &&
 			$this->groupManager->isInGroup($currentUserId, Application::OPEN_PROJECT_ENTITIES_NAME)
 		) {
diff --git a/lib/Service/OpenProjectAPIService.php b/lib/Service/OpenProjectAPIService.php
index 7709cacb..22e086fd 100644
--- a/lib/Service/OpenProjectAPIService.php
+++ b/lib/Service/OpenProjectAPIService.php
@@ -931,7 +931,7 @@ class OpenProjectAPIService {
 	 * @throws NotFoundException
 	 * @throws NoUserException
 	 */
-	public function createGroupfolder(): int {
+	public function createGroupfolder(): void {
 		if (version_compare(OC_Util::getVersionString(), '27') >= 0) {
 			// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
 			$groupfoldersFolderManager = new FolderManager($this->dbConnection, $this->groupManager, $this->mimeTypeLoader, $this->logger);
@@ -961,14 +961,6 @@ class OpenProjectAPIService {
 			Application::OPEN_PROJECT_ENTITIES_NAME,
 			true
 		);
-		$userFolder = $this->storage->getUserFolder(Application::OPEN_PROJECT_ENTITIES_NAME);
-		$openProjectFolder = $userFolder->get(Application::OPEN_PROJECT_ENTITIES_NAME);
-		$this->config->setAppValue(
-			Application::APP_ID,
-			'openproject_groupfolder_id',
-			(string)$openProjectFolder->getId()
-		);
-		return $openProjectFolder->getId();
 	}
 
 	// @phpstan-ignore-next-line - make phpstan not complain if groupfolders app does not exist
diff --git a/tests/acceptance/features/api/setup.feature b/tests/acceptance/features/api/setup.feature
index 5a3c53d9..1360f5d1 100644
--- a/tests/acceptance/features/api/setup.feature
+++ b/tests/acceptance/features/api/setup.feature
@@ -480,8 +480,7 @@ Feature: setup the integration through an API
           "nextcloud_oauth_client_name": {"type": "string", "pattern": "^OpenProject client$"},
           "openproject_redirect_uri": {"type": "string", "pattern": "^http:\/\/some-host.de\/oauth_clients\/[A-Za-z0-9]+\/callback$"},
           "nextcloud_client_id": {"type": "string", "pattern": "[A-Za-z0-9]+"},
-          "nextcloud_client_secret": {"type": "string", "pattern": "[A-Za-z0-9]+"},
-          "openproject_groupfolder_id": {"type": "integer"}
+          "nextcloud_client_secret": {"type": "string", "pattern": "[A-Za-z0-9]+"}
       },
       "not": {
       "required": [
diff --git a/tests/lib/Controller/ConfigControllerTest.php b/tests/lib/Controller/ConfigControllerTest.php
index da6c1d5c..73a451c1 100644
--- a/tests/lib/Controller/ConfigControllerTest.php
+++ b/tests/lib/Controller/ConfigControllerTest.php
@@ -558,8 +558,7 @@ class ConfigControllerTest extends TestCase {
 		$this->assertSame(
 			[
 				'status' => $adminConfigStatus,
-				'oPOAuthTokenRevokeStatus' => '',
-				'oPGroupFolderFileId' => null
+				'oPOAuthTokenRevokeStatus' => ''
 			],
 			$result->getData()
 		);