diff --git a/internal/federation/dereference.go b/internal/federation/dereference.go
index d9047f901..111c0b977 100644
--- a/internal/federation/dereference.go
+++ b/internal/federation/dereference.go
@@ -14,6 +14,8 @@ import (
 )
 
 func (f *federator) DereferenceRemoteAccount(username string, remoteAccountID *url.URL) (typeutils.Accountable, error) {
+	f.startHandshake(username, remoteAccountID)
+	defer f.stopHandshake(username, remoteAccountID)
 
 	transport, err := f.GetTransportForUser(username)
 	if err != nil {
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go
index 2fcf039b5..c4ae4139e 100644
--- a/internal/transport/derefinstance.go
+++ b/internal/transport/derefinstance.go
@@ -180,6 +180,6 @@ func dereferenceByNodeInfo(t *transport, c context.Context, iri *url.URL) (*gtsm
 	if nodeinfoHref == nil {
 		return nil, errors.New("could not find nodeinfo rel in well known response")
 	}
-aaaaaaaaaaaaaaaaa // do the second query
+    // TODO: do the second query
 	return nil, errors.New("not yet implemented")
 }