diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index 821af8966e..236f0ed311 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -992,13 +992,21 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
 
             protected override IEnumerable<IContent> PerformGetAll(params Guid[] ids)
             {
-                var sql = GetBaseQuery(false);
-                if (ids.Any())
+                Func<Sql, Sql> translate = s =>
                 {
-                    sql.Where("umbracoNode.uniqueID in (@ids)", new { ids = ids });
-                }
+                    if (ids.Any())
+                    {
+                        s.Where("umbracoNode.uniqueID in (@ids)", new { ids });
+                    }
+                    //we only want the newest ones with this method
+                    s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
+                    return s;
+                };
 
-                return _outerRepo.ProcessQuery(sql, new PagingSqlQuery(sql));
+                var sqlBaseFull = _outerRepo.GetBaseQuery(BaseQueryType.FullMultiple);
+                var sqlBaseIds = _outerRepo.GetBaseQuery(BaseQueryType.Ids);
+
+                return _outerRepo.ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
             }
 
             protected override Sql GetBaseQuery(bool isCount)
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
index 828ae843f8..ad2dd26a43 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
@@ -576,21 +576,13 @@ namespace Umbraco.Core.Persistence.Repositories
 
             protected override IEnumerable<IMedia> PerformGetAll(params Guid[] ids)
             {
-                Func<Sql, Sql> translate = s =>
+                var sql = GetBaseQuery(false);
+                if (ids.Any())
                 {
-                    if (ids.Any())
-                    {
-                        s.Where("umbracoNode.uniqueID in (@ids)", new { ids });
-                    }
-                    //we only want the newest ones with this method
-                    s.Where<DocumentDto>(x => x.Newest, SqlSyntax);
-                    return s;
-                };
+                    sql.Where("umbracoNode.uniqueID in (@ids)", new { ids = ids });
+                }
 
-                var sqlBaseFull = _outerRepo.GetBaseQuery(BaseQueryType.FullMultiple);
-                var sqlBaseIds = _outerRepo.GetBaseQuery(BaseQueryType.Ids);
-
-                return _outerRepo.ProcessQuery(translate(sqlBaseFull), new PagingSqlQuery(translate(sqlBaseIds)));
+                return _outerRepo.ProcessQuery(sql, new PagingSqlQuery(sql));
             }
 
             protected override Sql GetBaseQuery(bool isCount)