diff --git a/jobs/anime-characters/anime-characters.go b/jobs/anime-characters/anime-characters.go
index 7273d221..8a54bfed 100644
--- a/jobs/anime-characters/anime-characters.go
+++ b/jobs/anime-characters/anime-characters.go
@@ -11,9 +11,10 @@ import (
 func main() {
 	color.Yellow("Refreshing anime characters...")
 
+	allAnime, _ := arn.AllAnime()
 	rateLimiter := time.NewTicker(500 * time.Millisecond)
 
-	for anime := range arn.MustStreamAnime() {
+	for _, anime := range allAnime {
 		<-rateLimiter.C
 
 		chars, err := anime.RefreshAnimeCharacters()
diff --git a/jobs/avatars/avatars.go b/jobs/avatars/avatars.go
index f7516162..3a6a5bd5 100644
--- a/jobs/avatars/avatars.go
+++ b/jobs/avatars/avatars.go
@@ -96,8 +96,10 @@ func main() {
 	usersQueue := make(chan *arn.User, runtime.NumCPU())
 	StartWorkers(usersQueue, Work)
 
+	allUsers, _ := arn.AllUsers()
+
 	// We'll send each user to one of the worker threads
-	for user := range arn.MustStreamUsers() {
+	for _, user := range allUsers {
 		wg.Add(1)
 		usersQueue <- user
 	}