diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
index 808c0fbb99970923814ddf1f74c5f602ce8af582..1942f83b86cef349a00830bc05d372f5f68a9633 100644
--- a/lib/private/Files/Template/TemplateManager.php
+++ b/lib/private/Files/Template/TemplateManager.php
@@ -256,7 +256,10 @@ class TemplateManager implements ITemplateManager {
 			// Initial user setup without a provided path
 			if ($path === null) {
 				// All locations are default so we just need to rename the directory to the users language
-				if ($isDefaultSkeleton && $isDefaultTemplates && $userFolder->nodeExists('Templates')) {
+				if ($isDefaultSkeleton && $isDefaultTemplates) {
+					if (!$userFolder->nodeExists('Templates')) {
+						return '';
+					}
 					$newPath = $userFolder->getPath() . '/' . $userTemplatePath;
 					if ($newPath !== $userFolder->get('Templates')->getPath()) {
 						$userFolder->get('Templates')->move($newPath);