diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
index 58804e74..626dd02e 100644
--- a/code/controllers/CMSFileAddController.php
+++ b/code/controllers/CMSFileAddController.php
@@ -66,6 +66,8 @@ class CMSFileAddController extends LeftAndMain {
 			// The Upload class expects a folder relative *within* assets/
 			$path = preg_replace('/^' . ASSETS_DIR . '\//', '', $folder->getFilename());
 			$uploadField->setFolderName($path);
+		} else {
+			$uploadField->setFolderName(ASSETS_DIR);
 		}
 
 		$form = new Form(