diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferArena.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferArena.java
index 96206f518..95b7ca2b8 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferArena.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferArena.java
@@ -277,9 +277,9 @@ public boolean upload(CommandList commandList, Stream<PendingUpload> stream) {
         // If we weren't able to upload some buffers, they will have been left behind in the queue
         if (!queue.isEmpty()) {
             // Calculate the amount of memory needed for the remaining uploads
-            int remainingElements = queue.stream()
-                    .mapToInt(upload -> upload.getDataBuffer().getLength())
-                    .sum();
+            int remainingElements = (int)(queue.stream()
+                    .mapToLong(upload -> upload.getDataBuffer().getLength())
+                    .sum() / this.stride);
 
             // Ask the arena to grow to accommodate the remaining uploads
             // This will force a re-allocation and compaction, which will leave us a continuous free segment