diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 04e5e3e308a..d3a7115646c 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -378,6 +378,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 {