diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 599f09ae94..2f8d8f6d03 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1785,6 +1785,8 @@ QString DomainServer::getEntitiesReplacementFilePath() {
 void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message) {
     qDebug() << "Got request for octree data from " << message->getSenderSockAddr();
 
+    maybeHandleReplacementEntityFile();
+
     bool remoteHasExistingData { false };
     QUuid id;
     int version;
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index 6ad00d01c8..deb92ee0f6 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -16,6 +16,7 @@
 #include <quazip5/quazip.h>
 #include <quazip5/quazipfile.h>
 
+#include <LimitedNodeList.h>
 #include <OctreeUtils.h>
 
 EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
@@ -71,5 +72,13 @@ void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
 
     if (entitiesFile.open(QIODevice::WriteOnly)) {
         entitiesFile.write(data.toGzippedByteArray());
+        entitiesFile.close();
+
+        auto nodeList = DependencyManager::get<LimitedNodeList>();
+        nodeList->eachMatchingNode([](const SharedNodePointer& otherNode) -> bool {
+            return otherNode->getType() == NodeType::EntityServer;
+        }, [nodeList](const SharedNodePointer& otherNode) {
+            QMetaObject::invokeMethod(nodeList.data(), "killNodeWithUUID", Q_ARG(const QUuid&, otherNode->getUUID()));
+        });
     }
 }