3 files changed, 11 insertions, 10 deletions
diff --git a/internal/db/bundb/media.go b/internal/db/bundb/media.go
index 39e0ad0e3..3be7be39a 100644
--- a/internal/db/bundb/media.go
+++ b/internal/db/bundb/media.go
@@ -57,8 +57,6 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l
 		NewSelect().
 		Model(&attachments).
 		Where("? = ?", bun.Ident("media_attachment.cached"), true).
-		Where("? = ?", bun.Ident("media_attachment.avatar"), false).
-		Where("? = ?", bun.Ident("media_attachment.header"), false).
 		Where("? < ?", bun.Ident("media_attachment.created_at"), olderThan).
 		WhereGroup(" AND ", whereNotEmptyAndNotNull("media_attachment.remote_url")).
 		Order("media_attachment.created_at DESC")
@@ -70,6 +68,7 @@ func (m *mediaDB) GetRemoteOlderThan(ctx context.Context, olderThan time.Time, l
 	if err := q.Scan(ctx); err != nil {
 		return nil, m.conn.ProcessError(err)
 	}
+
 	return attachments, nil
 }
 
diff --git a/internal/db/bundb/media_test.go b/internal/db/bundb/media_test.go
index d6a4981f8..1676954ce 100644
--- a/internal/db/bundb/media_test.go
+++ b/internal/db/bundb/media_test.go
@@ -41,7 +41,7 @@ func (suite *MediaTestSuite) TestGetAttachmentByID() {
 func (suite *MediaTestSuite) TestGetOlder() {
 	attachments, err := suite.db.GetRemoteOlderThan(context.Background(), time.Now(), 20)
 	suite.NoError(err)
-	suite.Len(attachments, 2)
+	suite.Len(attachments, 3)
 }
 
 func (suite *MediaTestSuite) TestGetAvisAndHeaders() {
@@ -49,7 +49,7 @@ func (suite *MediaTestSuite) TestGetAvisAndHeaders() {
 
 	attachments, err := suite.db.GetAvatarsAndHeaders(ctx, "", 20)
 	suite.NoError(err)
-	suite.Len(attachments, 2)
+	suite.Len(attachments, 3)
 }
 
 func (suite *MediaTestSuite) TestGetLocalUnattachedOlderThan() {
diff --git a/internal/db/media.go b/internal/db/media.go
index 2f9ed79dc..2d4fbb441 100644
--- a/internal/db/media.go
+++ b/internal/db/media.go
@@ -29,18 +29,20 @@ import (
 type Media interface {
 	// GetAttachmentByID gets a single attachment by its ID
 	GetAttachmentByID(ctx context.Context, id string) (*gtsmodel.MediaAttachment, Error)
-	// GetRemoteOlderThan gets limit n remote media attachments older than the given olderThan time.
-	// These will be returned in order of attachment.created_at descending (newest to oldest in other words).
+
+	// GetRemoteOlderThan gets limit n remote media attachments (including avatars and headers) older than the given
+	// olderThan time. These will be returned in order of attachment.created_at descending (newest to oldest in other words).
 	//
 	// The selected media attachments will be those with both a URL and a RemoteURL filled in.
 	// In other words, media attachments that originated remotely, and that we currently have cached locally.
 	GetRemoteOlderThan(ctx context.Context, olderThan time.Time, limit int) ([]*gtsmodel.MediaAttachment, Error)
+
 	// GetAvatarsAndHeaders fetches limit n avatars and headers with an id < maxID. These headers
 	// and avis may be in use or not; the caller should check this if it's important.
 	GetAvatarsAndHeaders(ctx context.Context, maxID string, limit int) ([]*gtsmodel.MediaAttachment, Error)
-	// GetLocalUnattachedOlderThan fetches limit n local media attachments, older than the given time, which
-	// aren't header or avatars, and aren't attached to a status. In other words, attachments which were uploaded
-	// but never used for whatever reason, or attachments that were attached to a status which was subsequently
-	// deleted.
+
+	// GetLocalUnattachedOlderThan fetches limit n local media attachments (including avatars and headers), older than
+	// the given time, which aren't header or avatars, and aren't attached to a status. In other words, attachments which were
+	// uploaded but never used for whatever reason, or attachments that were attached to a status which was subsequently deleted.
 	GetLocalUnattachedOlderThan(ctx context.Context, olderThan time.Time, maxID string, limit int) ([]*gtsmodel.MediaAttachment, Error)
 }