diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index 15e0b8c9b5..054557e920 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -348,18 +348,19 @@ void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, S
     // Store message in case we need to disconnect from it later.
     callbacks.message = message;
 
+
+    auto weakNode = senderNode.toWeakRef();
+    connect(message.data(), &ReceivedMessage::progress, this, [this, weakNode, messageID, length](qint64 size) {
+        handleProgressCallback(weakNode, messageID, size, length);
+    });
+    connect(message.data(), &ReceivedMessage::completed, this, [this, weakNode, messageID]() {
+        handleCompleteCallback(weakNode, messageID);
+    });
+
     if (message->isComplete()) {
+        disconnect(message.data(), nullptr, this, nullptr);
         callbacks.completeCallback(true, error, message->readAll());
         messageCallbackMap.erase(requestIt);
-    } else {
-        auto weakNode = senderNode.toWeakRef();
-
-        connect(message.data(), &ReceivedMessage::progress, this, [this, weakNode, messageID, length](qint64 size) {
-            handleProgressCallback(weakNode, messageID, size, length);
-        });
-        connect(message.data(), &ReceivedMessage::completed, this, [this, weakNode, messageID]() {
-            handleCompleteCallback(weakNode, messageID);
-        });
     }
 }
 
diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp
index 9c756b0060..920c7ae036 100644
--- a/libraries/networking/src/AssetRequest.cpp
+++ b/libraries/networking/src/AssetRequest.cpp
@@ -77,7 +77,7 @@ void AssetRequest::start() {
     _assetRequestID = assetClient->getAsset(_hash, _byteRange.fromInclusive, _byteRange.toExclusive,
         [this, that, hash](bool responseReceived, AssetServerError serverError, const QByteArray& data) {
 
-            if (!that) {
+        if (!that) {
             qCWarning(asset_client) << "Got reply for dead asset request " << hash << "- error code" << _error;
             // If the request is dead, return
             return;