diff --git a/ipnsfs/system.go b/ipnsfs/system.go
index f937577448eb271f29aee8edfc6b9abd5bd8c35a..bdca87099574a60dc2d9fbc575ddb045716a4d72 100644
--- a/ipnsfs/system.go
+++ b/ipnsfs/system.go
@@ -159,8 +159,10 @@ func (fs *Filesystem) newKeyRoot(parent context.Context, k ci.PrivKey) (*KeyRoot
 		}
 	}
 
-	mnode, err := fs.dserv.Get(ctx, pointsTo)
+	tctx, _ := context.WithTimeout(parent, time.Second*5)
+	mnode, err := fs.dserv.Get(tctx, pointsTo)
 	if err != nil {
+		log.Errorf("Failed to retreive value '%s' for ipns entry: %s\n", pointsTo, err)
 		return nil, err
 	}