diff --git a/core/core.go b/core/core.go
index 91f243feb..aefcd3a20 100644
--- a/core/core.go
+++ b/core/core.go
@@ -36,7 +36,6 @@ func Start() error {
 	resetDirectories()
 
 	data.PopulateDefaults()
-	utils.MigrateCustomEmojiLocations()
 
 	if err := data.VerifySettings(); err != nil {
 		log.Error(err)
diff --git a/main.go b/main.go
index 6781f6ba3..c7ebf8ef4 100644
--- a/main.go
+++ b/main.go
@@ -48,7 +48,11 @@ func main() {
 			log.Fatalln("Cannot create data directory", err)
 		}
 	}
-	// Set up emoji directory
+
+	// Migrate old (pre 0.1.0) emoji to new location if they exist.
+	utils.MigrateCustomEmojiLocations()
+
+	// Otherwise save the default emoji to the data directory.
 	if err := data.SetupEmojiDirectory(); err != nil {
 		log.Fatalln("Cannot set up emoji directory", err)
 	}