diff --git a/zone/client.cpp b/zone/client.cpp
index 979eb294b..3bf285d78 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -9839,7 +9839,7 @@ void Client::SendDzCompassUpdate()
 	if (expedition)
 	{
 		auto compass = expedition->GetDynamicZone().GetCompassLocation();
-		if (zone && zone->GetZoneID() == compass.zone_id)
+		if (zone && zone->GetZoneID() == compass.zone_id && zone->GetInstanceID() == 0)
 		{
 			DynamicZoneCompassEntry_Struct entry;
 			entry.dz_zone_id = static_cast<uint16_t>(expedition->GetDynamicZone().GetZoneID());
@@ -9856,7 +9856,7 @@ void Client::SendDzCompassUpdate()
 	// todo: shared tasks, missions, and quests with an associated dz
 
 	// compass set via MarkSingleCompassLocation()
-	if (zone && zone->GetZoneID() == m_quest_compass.zone_id)
+	if (zone && zone->GetZoneID() == m_quest_compass.zone_id && zone->GetInstanceID() == 0)
 	{
 		DynamicZoneCompassEntry_Struct entry;
 		entry.dz_zone_id = 0;
diff --git a/zone/lua_expedition.cpp b/zone/lua_expedition.cpp
index a27ed0efa..f33718568 100644
--- a/zone/lua_expedition.cpp
+++ b/zone/lua_expedition.cpp
@@ -110,6 +110,11 @@ bool Lua_Expedition::HasReplayLockout() {
 	return self->HasReplayLockout();
 }
 
+void Lua_Expedition::RemoveCompass() {
+	Lua_Safe_Call_Void();
+	self->SetDzCompass(0, 0, 0, 0, true);
+}
+
 void Lua_Expedition::RemoveLockout(std::string event_name) {
 	Lua_Safe_Call_Void();
 	self->RemoveLockout(event_name);
@@ -117,12 +122,12 @@ void Lua_Expedition::RemoveLockout(std::string event_name) {
 
 void Lua_Expedition::SetCompass(uint32_t zone_id, float x, float y, float z) {
 	Lua_Safe_Call_Void();
-	return self->SetDzCompass(zone_id, x, y, z, true);
+	self->SetDzCompass(zone_id, x, y, z, true);
 }
 
 void Lua_Expedition::SetCompass(std::string zone_name, float x, float y, float z) {
 	Lua_Safe_Call_Void();
-	return self->SetDzCompass(zone_name, x, y, z, true);
+	self->SetDzCompass(zone_name, x, y, z, true);
 }
 
 void Lua_Expedition::SetLocked(bool lock_expedition) {
@@ -137,17 +142,17 @@ void Lua_Expedition::SetReplayLockoutOnMemberJoin(bool enable) {
 
 void Lua_Expedition::SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading) {
 	Lua_Safe_Call_Void();
-	return self->SetDzSafeReturn(zone_id, x, y, z, heading, true);
+	self->SetDzSafeReturn(zone_id, x, y, z, heading, true);
 }
 
 void Lua_Expedition::SetSafeReturn(std::string zone_name, float x, float y, float z, float heading) {
 	Lua_Safe_Call_Void();
-	return self->SetDzSafeReturn(zone_name, x, y, z, heading, true);
+	self->SetDzSafeReturn(zone_name, x, y, z, heading, true);
 }
 
 void Lua_Expedition::SetZoneInLocation(float x, float y, float z, float heading) {
 	Lua_Safe_Call_Void();
-	return self->SetDzZoneInLocation(x, y, z, heading, true);
+	self->SetDzZoneInLocation(x, y, z, heading, true);
 }
 
 luabind::scope lua_register_expedition() {
@@ -167,7 +172,8 @@ luabind::scope lua_register_expedition() {
 		.def("GetSecondsRemaining", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetSecondsRemaining)
 		.def("GetZoneID", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetZoneID)
 		.def("HasLockout", (bool(Lua_Expedition::*)(std::string))&Lua_Expedition::HasLockout)
-		.def("HasReplayLockout", (bool(Lua_Expedition::*)())&Lua_Expedition::HasReplayLockout)
+		.def("HasReplayLockout", (bool(Lua_Expedition::*)(void))&Lua_Expedition::HasReplayLockout)
+		.def("RemoveCompass", (void(Lua_Expedition::*)(void))&Lua_Expedition::RemoveCompass)
 		.def("RemoveLockout", (void(Lua_Expedition::*)(std::string))&Lua_Expedition::RemoveLockout)
 		.def("SetCompass", (void(Lua_Expedition::*)(uint32_t, float, float, float))&Lua_Expedition::SetCompass)
 		.def("SetCompass", (void(Lua_Expedition::*)(std::string, float, float, float))&Lua_Expedition::SetCompass)
diff --git a/zone/lua_expedition.h b/zone/lua_expedition.h
index 904d52dfe..3bc9893e6 100644
--- a/zone/lua_expedition.h
+++ b/zone/lua_expedition.h
@@ -65,6 +65,7 @@ public:
 	luabind::object GetLockouts(lua_State* L);
 	bool            HasLockout(std::string event_name);
 	bool            HasReplayLockout();
+	void            RemoveCompass();
 	void            RemoveLockout(std::string event_name);
 	void            SetCompass(uint32 zone_id, float x, float y, float z);
 	void            SetCompass(std::string zone_name, float x, float y, float z);