diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 998fbc5e..1f4858a1 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -410,7 +410,7 @@ type RepoIndexParams struct {
 	CommitsTrunc  []*object.Commit
 	TagsTrunc     []*types.TagReference
 	BranchesTrunc []types.Branch
-	ForkInfo      types.ForkInfo
+	ForkInfo      *types.ForkInfo
 	types.RepoIndexResponse
 	HTMLReadme         template.HTML
 	Raw                bool
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 0b7bc552..99866f96 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -66,7 +66,7 @@
             {{ end }}
         </optgroup>
     </select>
-    {{ if .ForkInfo.IsFork }}
+    {{ if and .ForkInfo .ForkInfo.IsFork }}
         {{ $disabled := "" }}
         {{ $title := "" }}
         {{ if eq .ForkInfo.Status 0 }}
diff --git a/appview/state/repo.go b/appview/state/repo.go
index a7bad731..080e6286 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -137,7 +137,7 @@ func (s *State) RepoIndex(w http.ResponseWriter, r *http.Request) {
 		RepoIndexResponse:  result,
 		CommitsTrunc:       commitsTrunc,
 		TagsTrunc:          tagsTrunc,
-		ForkInfo:           *forkInfo,
+		ForkInfo:           forkInfo,
 		BranchesTrunc:      branchesTrunc,
 		EmailToDidOrHandle: EmailToDidOrHandle(s, emails),
 	})
@@ -151,6 +151,10 @@ func getForkInfo(
 	w http.ResponseWriter,
 	user *oauth.User,
 ) (*types.ForkInfo, error) {
+	if user == nil {
+		return nil, nil
+	}
+
 	forkInfo := types.ForkInfo{
 		IsFork: repoInfo.Source != nil,
 		Status: types.UpToDate,