diff --git a/lib/private/util.php b/lib/private/util.php
index 227edfcf21..6f53be8446 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -612,7 +612,7 @@ class OC_Util {
 		$errors = array();
 		$CONFIG_DATADIRECTORY = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
 
-		if (!self::needUpgrade($config)) {
+		if (!self::needUpgrade($config) && $config->getSystemValue('installed', false)) {
 			// this check needs to be done every time
 			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
 		}