diff --git a/scripts/system/avatarFinderBeacon.js b/scripts/system/avatarFinderBeacon.js
index ca13f417e3..9005e69a5e 100644
--- a/scripts/system/avatarFinderBeacon.js
+++ b/scripts/system/avatarFinderBeacon.js
@@ -64,6 +64,10 @@ function updateBeacon(avatarSessionUUID) {
     beacons[avatarSessionUUID].update();
 }
 
+Window.domainChanged.connect(function () {
+    beacons = {};
+});
+
 Script.update.connect(function() {
     AvatarList.getAvatarIdentifiers().forEach(function(avatarSessionUUID) {
         updateBeacon(avatarSessionUUID);