diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 233253e11d..850ff47687 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -8,7 +8,7 @@
 	var/force = 0
 
 	var/list/armor
-	var/obj_integrity = 500
+	var/obj_integrity	//defaults to max_integrity
 	var/max_integrity = 500
 	var/integrity_failure = 0 //0 if we have no special broken behavior
 
@@ -41,6 +41,8 @@
 	. = ..()
 	if (!armor)
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	if(obj_integrity == null)
+		obj_integrity = max_integrity
 	if(on_blueprints && isturf(loc))
 		var/turf/T = loc
 		if(force_blueprints)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 1dd5776fb4..9358b22c49 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -50,7 +50,6 @@
 
 /obj/structure/window/Initialize(mapload, direct)
 	..()
-	obj_integrity = max_integrity
 	if(direct)
 		setDir(direct)
 	if(reinf && anchored)