diff --git a/src/services/StaticService.java b/src/services/StaticService.java
index 732bc657..f85a3282 100644
--- a/src/services/StaticService.java
+++ b/src/services/StaticService.java
@@ -26,9 +26,12 @@ import java.util.List;
 import java.util.Map;
 
 import resources.objects.building.BuildingObject;
+import resources.objects.cell.CellObject;
 import resources.objects.creature.CreatureObject;
 import resources.objects.tangible.TangibleObject;
 import main.NGECore;
+import engine.clientdata.ClientFileManager;
+import engine.clientdata.visitors.PortalVisitor;
 import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
@@ -108,6 +111,27 @@ public class StaticService implements INetworkDispatch {
 			((CreatureObject) object).setStaticNPC(true);
 		}
 		
+		if (object instanceof BuildingObject) {
+			BuildingObject building = (BuildingObject) object;
+			
+			if (building.getCells().size() == 0) {
+				String portalLayoutFilename = (String) building.getTemplateData().getAttribute("portalLayoutFilename");
+				
+				try {
+					PortalVisitor portal = ClientFileManager.loadFile(portalLayoutFilename, PortalVisitor.class);
+					
+					for (int i = 1; i <= portal.cellCount; i++) {
+						long cellObjectId = core.objectService.getDOId(planetName, "object/cell/shared_cell.iff", 0, object.getObjectID(), i, x, y, z);
+						CellObject childCell = (CellObject) core.objectService.createObject("object/cell/shared_cell.iff", cellObjectId, core.terrainService.getPlanetByName(planetName), new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), null, true, true);
+						childCell.setCellNumber(i);
+						building.add(childCell);
+					}
+				} catch (InstantiationException | IllegalAccessException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		
 		if (cellId == 0) {
 			if (!core.simulationService.add(object, (float) x, (float) z, true)) {
 				System.err.println("StaticService: Quadtree insert failed for: " + template);