diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
index 33d1392a..13f3b423 100644
--- a/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
+++ b/src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
@@ -148,8 +148,12 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
         renderButton.onClick(() -> {
             LOGGER.trace("Render button clicked");
             List<RenderJob> renderQueue = new ArrayList<>();
-            for (Entry entry : selectedEntries) {
-                renderQueue.add(entry.job);
+            if (selectedEntries.isEmpty()) {
+                renderQueue.addAll(jobs);
+            } else {
+                for (Entry entry : selectedEntries) {
+                    renderQueue.add(entry.job);
+                }
             }
             ReplayMod.instance.runLaterWithoutLock(() -> processQueue(container, replayHandler, renderQueue, () -> {}));
         });
@@ -337,7 +341,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
         addButton.setEnabled(timelineSupplier != null);
         editButton.setEnabled(selected == 1);
         removeButton.setEnabled(selected >= 1);
-        renderButton.setEnabled(selected > 0);
+        renderButton.setEnabled(jobs.size() > 0);
         renderButton.setI18nLabel("replaymod.gui.renderqueue.render" + (selected > 0 ? "selected" : "all"));
 
         String[] compatError = VideoRenderer.checkCompat();