diff --git a/VizhTalk.Learning.Application/QueryHandlers/LanguageQueryHandler.cs b/VizhTalk.Learning.Application/QueryHandlers/LanguageQueryHandler.cs
index c48865c..54c7649 100644
--- a/VizhTalk.Learning.Application/QueryHandlers/LanguageQueryHandler.cs
+++ b/VizhTalk.Learning.Application/QueryHandlers/LanguageQueryHandler.cs
@@ -49,8 +49,11 @@ public class GetLanguageByIdQueryHandler(IGenericDapper<LanguageDTO> languageDap
 {
     public async Task<LanguageDTO> Handle(GetLanguageByIdQuery request, CancellationToken cancellationToken)
     {
-        var sql = $"select * from Learning.Languages where Id = " +
-            $" @{nameof(Language.Id)}";
+        var sql = $"select " +
+            $"lan.{nameof(Language.Title)} as {nameof(LanguageDTO.Title)}," +
+            $"lan.{nameof(Language.Id)} as {nameof(LanguageDTO.Id)}," +
+            $"CONVERT(nvarchar(max),m.FileId) as {nameof(LanguageDTO.Icon)}" +
+            $"from Learning.Languages as lan where lan.Id = @{nameof(Language.Id)}";
 
         var language = await languageDapper.GetAsync(sql, new { request.Id });
         return language;