diff --git a/internal/services/runservice/api/api.go b/internal/services/runservice/api/api.go
index 9eb958e..75667ea 100644
--- a/internal/services/runservice/api/api.go
+++ b/internal/services/runservice/api/api.go
@@ -396,6 +396,10 @@ func (h *RunHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
+	if run == nil {
+		httpError(w, util.NewErrNotFound(errors.Errorf("run %q doesn't exist", runID)))
+		return
+	}
 
 	cgts, err := types.MarshalChangeGroupsUpdateToken(cgt)
 	if err != nil {