diff --git a/pkg/feeds/feeds.go b/pkg/feeds/feeds.go
index 2495fc4..1085e8f 100644
--- a/pkg/feeds/feeds.go
+++ b/pkg/feeds/feeds.go
@@ -177,7 +177,7 @@ func (s *Service) BuildFeed(hashID string) ([]byte, error) {
 		logger.WithError(err).Error("failed to build feed")
 
 		// Save error to cache to avoid spamming
-		_ = s.cache.Set(hashID, err.Error(), 10 * time.Minute)
+		_ = s.cache.Set(hashID, err.Error(), 10*time.Minute)
 
 		return nil, err
 	}
@@ -189,13 +189,6 @@ func (s *Service) BuildFeed(hashID string) ([]byte, error) {
 		}
 	}
 
-	if oldCount != len(feed.Episodes) {
-		if err := s.storage.UpdateFeed(feed); err != nil {
-			logger.WithError(err).Error("failed to save feed")
-			return nil, err
-		}
-	}
-
 	// Format podcast
 
 	podcast, err := s.buildPodcast(feed)
@@ -212,6 +205,14 @@ func (s *Service) BuildFeed(hashID string) ([]byte, error) {
 		return nil, err
 	}
 
+	// Save to database
+
+	if oldCount != len(feed.Episodes) {
+		if err := s.storage.UpdateFeed(feed); err != nil {
+			logger.WithError(err).Error("failed to save feed")
+		}
+	}
+
 	return []byte(body), nil
 }