diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 93b07e37b2e..1d63cffb86e 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -388,6 +388,9 @@ class Setup {
 
 		$this->config->setValues($newConfigValues);
 
+		// Ensure instanceid is generated during the installation.
+		\OC_Util::getInstanceId();
+
 		$this->outputDebug($output, 'Configuring database');
 		$dbSetup->initialize($options);
 		try {