diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs
index 3fe57a6d1..29866e88e 100644
--- a/services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/directory/src/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using AutoMapper;
@@ -32,6 +33,8 @@ public async Task<IEnumerable<LanguageViewModel>> Handle(
                 CancellationToken cancellationToken)
             {
                 return await _context.Languages
+                    .Where(l => l.FilterListLanguages.Any())
+                    .OrderBy(l => l.Iso6391)
                     .ProjectTo<LanguageViewModel>(_mapper.ConfigurationProvider)
                     .ToListAsync(cancellationToken);
             }
@@ -41,7 +44,10 @@ public class LicenseViewModelProfile : Profile
         {
             public LicenseViewModelProfile()
             {
-                CreateMap<Language, LanguageViewModel>();
+                CreateMap<Language, LanguageViewModel>()
+                    .ForMember(l => l.FilterListIds,
+                        o => o.MapFrom(l =>
+                            l.FilterListLanguages.Select(fll => fll.FilterListId).OrderBy(flid => flid)));
             }
         }