diff --git a/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java b/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
index 49ca3c7f..fd1f03c3 100644
--- a/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
+++ b/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
@@ -175,7 +175,7 @@ public class StreamSerializer {
 	 * @throws IOException If the operation fails due to reflection problems.
 	 */
 	public String serializeItemStack(ItemStack stack) throws IOException {
-		return Base64.getEncoder().encodeToString(this.serializeItemStackToByteArray(stack));
+		return Base64.getMimeEncoder().encodeToString(this.serializeItemStackToByteArray(stack));
 	}
 
 	/**
@@ -185,7 +185,7 @@ public class StreamSerializer {
 	 * @return A deserialized item stack, or NULL if the serialized ItemStack was also NULL.
 	 */
 	public ItemStack deserializeItemStack(String input) {
-		return this.deserializeItemStackFromByteArray(Base64.getDecoder().decode(input));
+		return this.deserializeItemStackFromByteArray(Base64.getMimeDecoder().decode(input));
 	}
 
 	/**