diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3ae78e6099..4f32383bd4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4032,13 +4032,13 @@ void process_crossed_region(LLMessageSystem* msg, void**)
     if (isAgentAvatarValid())
     {
         gAgentAvatarp->resetRegionCrossingTimer();
+        // <FS:Ansariel> FIRE-12004: Attachments getting lost on TP; this is apparently the place to
+        //               hook in for region crossings - we get an info from the simulator that we
+        //               crossed a region and then the viewer starts the handover process. We only
+        //               receive this message if we can actually cross the region and aren't blocked
+        //               for some reason (e.g. banned, group access...)
+        gAgentAvatarp->setIsCrossingRegion(true);
     }
-    // <FS:Ansariel> FIRE-12004: Attachments getting lost on TP; this is apparently the place to
-    //               hook in for region crossings - we get an info from the simulator that we
-    //               crossed a region and then the viewer starts the handover process. We only
-    //               receive this message if we can actually cross the region and aren't blocked
-    //               for some reason (e.g. banned, group access...)
-    gAgentAvatarp->setIsCrossingRegion(true);
 
     U32 sim_ip;
     msg->getIPAddrFast(_PREHASH_RegionData, _PREHASH_SimIP, sim_ip);