diff --git a/plugins/doors/cl_plugin.lua b/plugins/doors/cl_plugin.lua
index 030e8de9d..d6a314851 100644
--- a/plugins/doors/cl_plugin.lua
+++ b/plugins/doors/cl_plugin.lua
@@ -169,9 +169,10 @@ net.Receive("ixDoorMenu", function()
 
 	local door = net.ReadEntity()
 	local access = net.ReadTable()
-	local entity = net.ReadEntity()
 
-	if (IsValid(door)) then
+	if (IsValid(door) and !table.IsEmpty(access)) then
+		local entity = net.ReadEntity()
+
 		ix.gui.door = vgui.Create("ixDoorMenu")
 		ix.gui.door:SetDoor(door, access, entity)
 	end
diff --git a/plugins/doors/sh_plugin.lua b/plugins/doors/sh_plugin.lua
index 031c4e10b..0b60be7fd 100644
--- a/plugins/doors/sh_plugin.lua
+++ b/plugins/doors/sh_plugin.lua
@@ -52,6 +52,8 @@ do
 
 			if (#receivers > 0) then
 				net.Start("ixDoorMenu")
+					net.WriteEntity(self)
+					net.WriteTable({})
 				net.Send(receivers)
 			end