diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
index 0a3464c5c..6201debef 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
@@ -203,6 +203,9 @@ class WorldRenderer(
         lock.unlock()
     }
 
+    override fun prePrepareDraw() {
+        meshingQueue.work()
+    }
 
     override fun postPrepareDraw() {
         if (clearVisibleNextFrame) {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/meshing/tasks/MeshPrepareTaskManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/meshing/tasks/MeshPrepareTaskManager.kt
index 1a8b3aa08..995522c4c 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/meshing/tasks/MeshPrepareTaskManager.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/meshing/tasks/MeshPrepareTaskManager.kt
@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2022 Moritz Zwerger
+ * Copyright (C) 2020-2023 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -21,7 +21,7 @@ import de.bixilon.minosoft.gui.rendering.world.WorldRenderer
 
 class MeshPrepareTaskManager(
     private val renderer: WorldRenderer,
-    val max: Int = maxOf(DefaultThreadPool.threadCount - 2, 1),
+    val max: Int = minOf(maxOf(Runtime.getRuntime().availableProcessors() - 1, 1), DefaultThreadPool.threadCount - 1),
 ) {
     private val tasks: MutableSet<MeshPrepareTask> = mutableSetOf() // current running section preparing tasks
     private val lock = SimpleLock()