diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb
index bc1f448d..017c6727 100644
--- a/Services.EmailService/EmailService.vb
+++ b/Services.EmailService/EmailService.vb
@@ -335,12 +335,11 @@ Public Class EmailService
 
                     Dim oAccountQueue As DataRow()
 
-                    ' TODO: Sort by guid
                     Select Case Database
                         Case DatabaseType.Firebird
-                            oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}")
+                            oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
                         Case Else
-                            oAccountQueue = oEmailQueue.Select($"SENDING_PROFILE = {oAccount.Guid}")
+                            oAccountQueue = oEmailQueue.Select($"SENDING_PROFILE = {oAccount.Guid}", "GUID ASC")
                     End Select
 
                     ' No mails for this profile