diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
index 789b243b2..d9254d034 100644
--- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
@@ -194,6 +194,8 @@ namespace Discord.Rest
             }
 
             index = 0;
+            codeBlockIndex = 0;
+            closeIndex = 0;
             while (true)
             {
                 index = text.IndexOf("@here", index);