diff --git a/appview/state/repo.go b/appview/state/repo.go
index c19c4cc..a7bad73 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -124,7 +124,7 @@ func (s *State) RepoIndex(w http.ResponseWriter, r *http.Request) {
 	user := s.oauth.GetUser(r)
 	repoInfo := f.RepoInfo(s, user)
 
-	forkInfo, err := getForkInfo(repoInfo, s, f, us, w, user)
+	forkInfo, err := getForkInfo(repoInfo, s, f, w, user)
 	if err != nil {
 		log.Printf("Failed to fetch fork information: %v", err)
 		return
@@ -148,7 +148,6 @@ func getForkInfo(
 	repoInfo repoinfo.RepoInfo,
 	s *State,
 	f *FullyResolvedRepo,
-	us *knotclient.UnsignedClient,
 	w http.ResponseWriter,
 	user *oauth.User,
 ) (*types.ForkInfo, error) {
@@ -168,6 +167,12 @@ func getForkInfo(
 		return &forkInfo, nil
 	}
 
+	us, err := knotclient.NewUnsignedClient(repoInfo.Source.Knot, s.config.Core.Dev)
+	if err != nil {
+		log.Printf("failed to create unsigned client for %s", repoInfo.Source.Knot)
+		return nil, err
+	}
+
 	resp, err := us.Branches(repoInfo.Source.Did, repoInfo.Source.Name)
 	if err != nil {
 		log.Println("failed to reach knotserver", err)