diff --git a/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs b/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs
index b5737036..4df14bcb 100644
--- a/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs	
+++ b/FFXIVClassic World Server/DataObjects/Group/Linkshell.cs	
@@ -222,6 +222,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
             SendGroupPacketsAll(GetMemberIds());
             ResendWorkValues();
 
+            //If active, remove it
+            if (requestSession.activeLinkshellName.Equals(name))
+            {
+                SubPacket activeLsPacket = SetActiveLinkshellPacket.BuildPacket(requestSession.sessionId, 0);
+                requestSession.clientConnection.QueuePacket(activeLsPacket);
+                requestSession.SetActiveLS("");
+            }
+
             //Delete group for kicked guy
             SendDeletePacket(requestSession);
         }
@@ -260,6 +268,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
             SendGroupPacketsAll(GetMemberIds());
             ResendWorkValues();
 
+            //If active, remove it
+            if (requestSession.activeLinkshellName.Equals(name))
+            {
+                SubPacket activeLsPacket = SetActiveLinkshellPacket.BuildPacket(requestSession.sessionId, 0);
+                requestSession.clientConnection.QueuePacket(activeLsPacket);
+                requestSession.SetActiveLS("");
+            }
+
             //Delete group for kicked guy
             SendDeletePacket(kickedSession);
             
diff --git a/data/scripts/commands/TradeOfferCommand.lua b/data/scripts/commands/TradeOfferCommand.lua
index 8222d7d8..75eaedff 100644
--- a/data/scripts/commands/TradeOfferCommand.lua
+++ b/data/scripts/commands/TradeOfferCommand.lua
@@ -10,10 +10,12 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto
 
 	local otherActor = nil;
 
-	if (name ~= nil) then
-		otherActor = player:GetZone():FindPCInZone(name);
-	elseif (actorId ~= nil) then
+	--ActorID Search
+	if (actorId ~= nil) then
 		otherActor = player:GetZone():FindActorInArea(actorId);
+	--Name Search
+	elseif (name ~= nil) then
+		otherActor = player:GetZone():FindPCInZone(name);
 	end
 	
 	if (otherActor ~= nil) then
@@ -21,6 +23,5 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto
 	else
 	end
 	
-	player:EndEvent();
-	
+	player:EndEvent();	
 end
\ No newline at end of file