diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java
index b6521a74c..4106b9d52 100644
--- a/src/main/java/net/discordjug/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java
+++ b/src/main/java/net/discordjug/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java
@@ -117,7 +117,7 @@ public Optional<CustomTag> findById(long id) throws DataAccessException {
 	 * @return A List with all custom commands.
 	 */
 	public List<CustomTag> getCustomTagsByGuildId(long guildId) {
-		return jdbcTemplate.query("SELECT * FROM custom_tags WHERE guild_id = ?", (rs, row)->this.read(rs),
+		return jdbcTemplate.query("SELECT * FROM custom_tags WHERE guild_id = ? ORDER BY name", (rs, row)->this.read(rs),
 				guildId);
 	}