diff --git a/src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go b/src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go
index 28211ba4ca060203a671546f2c9fc1fc3d975ede..07ceb4c2b7cf2f747223babe36187474935563bd 100644
--- a/src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go
+++ b/src/github.com/turt2live/matrix-media-repo/api/custom/datastores.go
@@ -89,7 +89,7 @@ func GetDatastoreStorageEstimate(r *http.Request, log *logrus.Entry, user api.Us
 		seenMediaHashes[record.Sha256Hash] = true
 	}
 
-	thumbnails, err := db.GetOldMediaInDatastore(datastoreId, beforeTs)
+	thumbnails, err := db.GetOldThumbnailsInDatastore(datastoreId, beforeTs)
 	for _, record := range thumbnails {
 		estimates.ThumbnailsAffected++
 
diff --git a/src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go b/src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go
index e58d969c9e48b8e261650317b4d3498a495c064a..545c9ddb38410f3c01d6c79cbdde0c50ca1fee97 100644
--- a/src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go
+++ b/src/github.com/turt2live/matrix-media-repo/storage/stores/metadata_store.go
@@ -14,9 +14,8 @@ type folderSize struct {
 
 const selectSizeOfDatastore = "SELECT COALESCE(SUM(size_bytes), 0) + COALESCE((SELECT SUM(size_bytes) FROM thumbnails WHERE datastore_id = $1), 0) AS size_total FROM media WHERE datastore_id = $1;"
 const upsertLastAccessed = "INSERT INTO last_access (sha256_hash, last_access_ts) VALUES ($1, $2) ON CONFLICT (sha256_hash) DO UPDATE SET last_access_ts = $2"
-const selectMediaLastAccessedBeforeInDatastore = "SELECT m.sha256_hash, m.size_bytes, m.location, m.datastore_id, m.creation_ts, a.last_access_ts FROM media AS m JOIN last_access AS a ON m.sha256_hash = a.sha256_hash WHERE a.last_access_ts < $1 AND m.datastore_id = $2";
-
-const selectThumbnailsLastAccessedBeforeInDatastore = "SELECT m.sha256_hash, m.size_bytes, m.location, m.datastore_id, m.creation_ts, a.last_access_ts FROM thumbnails AS m JOIN last_access AS a ON m.sha256_hash = a.sha256_hash WHERE a.last_access_ts < $1 AND m.datastore_id = $2";
+const selectMediaLastAccessedBeforeInDatastore = "SELECT m.sha256_hash, m.size_bytes, m.location, m.datastore_id, m.creation_ts, a.last_access_ts FROM media AS m JOIN last_access AS a ON m.sha256_hash = a.sha256_hash WHERE a.last_access_ts < $1 AND m.datastore_id = $2"
+const selectThumbnailsLastAccessedBeforeInDatastore = "SELECT m.sha256_hash, m.size_bytes, m.location, m.datastore_id, m.creation_ts, a.last_access_ts FROM thumbnails AS m JOIN last_access AS a ON m.sha256_hash = a.sha256_hash WHERE a.last_access_ts < $1 AND m.datastore_id = $2"
 
 type metadataStoreStatements struct {
 	upsertLastAccessed                            *sql.Stmt