diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index 79a9a34102..d0a706f2a4 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -72,8 +72,8 @@ void DiscoverabilityManager::updateLocation() {
 
             // in case the place/domain isn't in the database, we send the network address and port
             auto& domainSockAddr = domainHandler.getSockAddr();
-            const QString NETWORK_ADRESS_KEY_IN_LOCATION = "network_address";
-            locationObject.insert(NETWORK_ADRESS_KEY_IN_LOCATION, domainSockAddr.getAddress().toString());
+            const QString NETWORK_ADDRESS_KEY_IN_LOCATION = "network_address";
+            locationObject.insert(NETWORK_ADDRESS_KEY_IN_LOCATION, domainSockAddr.getAddress().toString());
 
             const QString NETWORK_ADDRESS_PORT_IN_LOCATION = "network_port";
             locationObject.insert(NETWORK_ADDRESS_PORT_IN_LOCATION, domainSockAddr.getPort());
diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index 1816f6b5e3..4d8fe6cb8f 100644
--- a/scripts/system/makeUserConnection.js
+++ b/scripts/system/makeUserConnection.js
@@ -458,6 +458,8 @@ function endHandshake() {
         debug("removing animation");
         MyAvatar.removeAnimationStateHandler(animHandlerId);
     }
+    // No-op if we were successful, but this way we ensure that failures and abandoned handshakes don't leave us in a weird state.
+    request({uri: requestUrl, method: 'DELETE'}, debug);
 }
 
 function updateTriggers(value, fromKeyboard, hand) {