diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index e3f9eb213db..424e94eee07 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1193,7 +1193,8 @@ About the new airlock wires panel:
 				da.anchored = 1
 				if(mineral)
 					da.glass = mineral
-				else if(glass)
+				//else if(glass)
+				else if(glass && !da.glass)
 					da.glass = 1
 				da.state = 1
 				da.created_name = src.name
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 6fc0e0f7c95..986b25b7648 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -6,4 +6,5 @@
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glass.dmi'
 	opacity = 0
-	glass = 1
\ No newline at end of file
+	glass = 1
+	assembly_type = "obj/structure/door_assembly/multi_tile"
\ No newline at end of file
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 84fddc07066..6856c706341 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -106,10 +106,13 @@ obj/structure/door_assembly
 		dir = EAST
 		var/width = 1
 
-//Temporary until we get sprites.
-//		airlock_type = "/multi_tile/maint"
-		glass = 1
+/*Temporary until we get sprites.
 		glass_type = "/multi_tile/glass"
+		airlock_type = "/multi_tile/maint"
+		glass = 1*/
+		base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
+		airlock_type = "/multi_tile/glass"
+		glass = -1 //To prevent bugs in deconstruction process.
 
 		New()
 			if(dir in list(EAST, WEST))
@@ -118,6 +121,7 @@ obj/structure/door_assembly
 			else
 				bound_width = world.icon_size
 				bound_height = width * world.icon_size
+			update_state()
 
 		Move()
 			. = ..()