diff --git a/jarvis/cogs/jokes.py b/jarvis/cogs/jokes.py
index b6a5854..887fb11 100644
--- a/jarvis/cogs/jokes.py
+++ b/jarvis/cogs/jokes.py
@@ -70,6 +70,18 @@ class JokeCog(commands.Cog):
                 )
             body_chunks = []
 
+            body = ""
+            for word in result["body"].split(" "):
+                if len(body) + 1 + len(word) > 1024:
+                    body_chunks.append(Field("​", body, False))
+                    body = ""
+                if word == "\n" and body == "":
+                    continue
+                elif word == "\n":
+                    body += word
+                else:
+                    body += " " + word
+
             for chunk in result["body"].split("\n"):
                 if len(chunk) > 0:
                     body_chunks.append(Field("​", chunk, False))