diff --git a/packages/trilium-core/src/routes/api/setup.ts b/packages/trilium-core/src/routes/api/setup.ts
index 64f440e5e8..09a08189f2 100644
--- a/packages/trilium-core/src/routes/api/setup.ts
+++ b/packages/trilium-core/src/routes/api/setup.ts
@@ -15,7 +15,7 @@ function getStatus() {
 
 async function setupNewDocument(req: Request) {
     const { skipDemoDb } = req.query;
-    await sqlInit.createInitialDatabase(!!skipDemoDb);
+    await sqlInit.createInitialDatabase(skipDemoDb !== undefined);
 }
 
 function setupSyncFromServer(req: Request): Promise<SetupSyncFromServerResponse> {
diff --git a/packages/trilium-core/src/services/sql_init.ts b/packages/trilium-core/src/services/sql_init.ts
index d53cac5716..758549f144 100644
--- a/packages/trilium-core/src/services/sql_init.ts
+++ b/packages/trilium-core/src/services/sql_init.ts
@@ -182,7 +182,7 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
     });
 
     // Import demo content.
-    if (getDemoArchive) {
+    if (!skipDemoDb && getDemoArchive) {
         log.info("Importing demo content...");
         const demoFile = await getDemoArchive();
         if (demoFile) {