diff --git a/packages/client/src/renderer/camera.ts b/packages/client/src/renderer/camera.ts
index 0a77944777..f5e7c5c160 100644
--- a/packages/client/src/renderer/camera.ts
+++ b/packages/client/src/renderer/camera.ts
@@ -360,12 +360,8 @@ export default class Camera {
         offset = 2,
         offsetRight = offset
     ): void {
-        for (let y = this.gridY - offset, maxY = y + this.gridHeight + offsetRight; y < maxY; y++)
-            for (
-                let x = this.gridX - offset, maxX = x + this.gridWidth + offsetRight;
-                x < maxX;
-                x++
-            ) {
+        for (let y = this.gridY - offset; y < this.gridY + this.gridHeight + offsetRight; y++)
+            for (let x = this.gridX - offset; x < this.gridX + this.gridWidth + offsetRight; x++) {
                 if (x < 0 || y < 0 || x >= this.width || y >= this.height) continue;
                 callback(x, y);
             }
diff --git a/packages/client/src/renderer/canvas.ts b/packages/client/src/renderer/canvas.ts
index a36da3761a..8366e80577 100644
--- a/packages/client/src/renderer/canvas.ts
+++ b/packages/client/src/renderer/canvas.ts
@@ -95,11 +95,26 @@ export default class Canvas extends Renderer {
         // Sets the view according to the camera.
         this.updateDrawingView();
 
-        // Iterate through all the visible tiles and draw them.
-        this.forEachVisibleTile(
-            (tile: ClientTile, index: number) => this.parseTile(tile, index),
-            2
-        );
+        /**
+         * I made a decision to sacrifice legibility to maximize performance. We avoid using
+         * `forEachVisiblePosition` so that we do not make a ridiculous amount of callbacks
+         * for each tile. We do the iteration through the visible tiles using a for loop and
+         * all within one function.
+         */
+
+        for (let y = this.camera.gridY - 2; y < this.camera.gridY + this.camera.gridHeight; y++)
+            for (
+                let x = this.camera.gridX - 2;
+                x < this.camera.gridX + this.camera.gridWidth;
+                x++
+            ) {
+                // Prevent out of bounds coordinates.
+                if (this.map.isOutOfBounds(x, y)) continue;
+
+                let index = x + y * this.map.width;
+
+                this.parseTile(this.map.data[index], index);
+            }
 
         this.saveFrame();
         this.restoreDrawing();
@@ -469,6 +484,9 @@ export default class Canvas extends Renderer {
      */
 
     private parseTile(tile: ClientTile, index: number): void {
+        // Ignore empty tiles.
+        if (tile === 0) return;
+
         // Check for transformed tiles and draw them.
         if ((tile as TransformedTile).tileId)
             return this.drawVisibleTile(tile as TransformedTile, index);
diff --git a/packages/client/src/renderer/renderer.ts b/packages/client/src/renderer/renderer.ts
index 0dfb460ef1..d48835d5bd 100644
--- a/packages/client/src/renderer/renderer.ts
+++ b/packages/client/src/renderer/renderer.ts
@@ -1784,29 +1784,6 @@ export default class Renderer {
         //
     }
 
-    /**
-     * Iterates through all the indexes and extracts the tile data at that
-     * specified index by iterating through each tile array (if present) or
-     * returning the tile data from the map.
-     * @param callback Returns a region tile object containing rendering information
-     * such as tileId, x, y, and flip flags. The index is the positioning in the map.
-     * @param offset How much to look outside the visible camera proportions.
-     */
-
-    protected forEachVisibleTile(
-        callback: (data: ClientTile, index: number) => void,
-        offset = 0
-    ): void {
-        this.forEachVisibleIndex((index) => {
-            let indexData = this.map.data[index];
-
-            if (indexData === 0) return;
-
-            if (Array.isArray(indexData)) for (let data of indexData) callback(data, index);
-            else callback(indexData, index);
-        }, offset);
-    }
-
     /**
      * Iterates through all the indexes in the current camera view. The offset
      * is used to look `offset` amount of tiles outside the camera view.