diff --git a/src/DatabaseServices/Database.ts b/src/DatabaseServices/Database.ts
index b5410cb7e..bf9d7f6b3 100644
--- a/src/DatabaseServices/Database.ts
+++ b/src/DatabaseServices/Database.ts
@@ -24,7 +24,6 @@ import { TemplateTable } from './Template/TemplateTable';
 import { TextureTableRecord } from './Texture';
 import { TextureTable } from './TextureTable';
 import { WblockCloneFiler } from './WblockCloneFiler';
-import { ViewportEntity } from './ViewportEntity';
 
 interface OwnerContainer
 {
@@ -64,11 +63,9 @@ export class Database
         this.GroupTable = new GroupTable().SetOwnerDatabase(this);
         this.Lights = new BlockTableRecord().SetOwnerDatabase(this);
         this.ProcessingGroupTable = new ProcessingGroupTable().SetOwnerDatabase(this);
-
-        this.LayoutSpace = new BlockTableRecord().SetOwnerDatabase(this);
-
         this.hm = new HistoricManage().SetDefaultDb(this);
         this.hm.Enable = false;
+        this.LayoutSpace = new BlockTableRecord().SetOwnerDatabase(this);
 
         if (buildDefaultDrawing)
         {
@@ -139,7 +136,6 @@ export class Database
 
         this.idIndex = 1;
         this.ModelSpace.SetOwnerDatabase(this);
-        this.LayoutSpace.SetOwnerDatabase(this);
         this.MaterialTable.SetOwnerDatabase(this);
         this.TextureTable.SetOwnerDatabase(this);
         this.TemplateTable.SetOwnerDatabase(this);
@@ -147,6 +143,7 @@ export class Database
         this.Lights.SetOwnerDatabase(this);
         this.ProcessingGroupTable.SetOwnerDatabase(this);
         this.hm.SetOwnerDatabase(this);
+        this.LayoutSpace.SetOwnerDatabase(this);
         this.idIndex = 100;
     }