diff --git a/ChannelSurfCli/Utils/Messages.cs b/ChannelSurfCli/Utils/Messages.cs
index 3b65b6d..c4a3984 100644
--- a/ChannelSurfCli/Utils/Messages.cs
+++ b/ChannelSurfCli/Utils/Messages.cs
@@ -36,7 +36,7 @@ public static void ScanMessagesByChannel(List<Models.Combined.ChannelsMapping> c
             attachmentsToUpload.Clear();
 
             Console.WriteLine("Migrating messages in channel " + channelsMapping.slackChannelName);
-            foreach (var file in Directory.GetFiles(Path.Combine(basePath, channelsMapping.slackChannelName)))
+            foreach (var file in Directory.GetFiles(Path.Combine(basePath, channelsMapping.slackChannelName)).OrderBy(f => f))
             {
                 Console.WriteLine("File " + file);
                 using (FileStream fs = new FileStream(file, FileMode.Open, FileAccess.Read))