diff --git a/src/Discord.Net/DiscordClient.Channels.cs b/src/Discord.Net/DiscordClient.Channels.cs
index 061dd565c..0a2fdae20 100644
--- a/src/Discord.Net/DiscordClient.Channels.cs
+++ b/src/Discord.Net/DiscordClient.Channels.cs
@@ -157,7 +157,7 @@ namespace Discord
 				int oldPos = channel.Position;
 				int newPos = position.Value;
 				int minPos;
-				Channel[] channels = channel.Server.Channels.OrderBy(x => x.Position).ToArray();
+				Channel[] channels = channel.Server.Channels.Where(x => x.Type == channel.Type).OrderBy(x => x.Position).ToArray();
 
 				if (oldPos < newPos) //Moving Down
 				{