diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua
index 0dcb9c59d9..f01ed51c73 100644
--- a/src/Classes/ImportTab.lua
+++ b/src/Classes/ImportTab.lua
@@ -328,8 +328,9 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
 		end
 
 		if self.importCodeJson then
-			self:ImportItemsAndSkills(self.importCodeJson)
 			self:ImportPassiveTreeAndJewels(self.importCodeJson)
+			self.build.calcsTab:BuildOutput()
+			self:ImportItemsAndSkills(self.importCodeJson)
 			return
 		end
 
diff --git a/src/HeadlessWrapper.lua b/src/HeadlessWrapper.lua
index eb75b4d4e2..e96475afd3 100644
--- a/src/HeadlessWrapper.lua
+++ b/src/HeadlessWrapper.lua
@@ -218,8 +218,9 @@ end
 function loadBuildFromJSON(getItemsJSON, getPassiveSkillsJSON)
 	mainObject.main:SetMode("BUILD", false, "")
 	runCallback("OnFrame")
+	build.importTab:ImportPassiveTreeAndJewels(getPassiveSkillsJSON)
+	build.calcsTab:BuildOutput()
 	local charData = build.importTab:ImportItemsAndSkills(getItemsJSON)
-	build.importTab:ImportPassiveTreeAndJewels(getPassiveSkillsJSON, charData)
 	-- You now have a build without a correct main skill selected, or any configuration options set
 	-- Good luck!
 end