diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef6fdf998d163645e3707a85a29780a1a6a64527..4f0a6d6f51570e9136a92ee665ef50d9b1b775c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ TBD
 - Fix survey not appearing on first login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/917))
 - Fix failue deleting server's DB files on server delete ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/916))
 - Fix server.properties overwritten in bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/915))
+- Fix zip backup download button always downloading the most recent, not the selected backup ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/913))
+- Fix download button showing for snapshot backups ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/913))
 ### Tweaks
 - Provide better feedback on restore failures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/914))
 ### Lang
diff --git a/app/frontend/templates/panel/server_backup_edit.html b/app/frontend/templates/panel/server_backup_edit.html
index 8354f146b6cef1a6d52f17546b21464ad732c131..286c279cd97ddb60278fda62a679dd0702a5a327 100644
--- a/app/frontend/templates/panel/server_backup_edit.html
+++ b/app/frontend/templates/panel/server_backup_edit.html
@@ -235,12 +235,14 @@
                     {% for backup in data['backup_list'] %}
                     <tr>
                       <td>
+                        {% if data["backup_config"]["backup_type"] != "snapshot" %}
                         <button class="btn btn-primary download" data-file="{{backup['path']}}">
                           <i class="fas fa-download" aria-hidden="true"></i>
                           {{ translate('serverBackups', 'download', data['lang']) }}
                         </button>
                         <br>
                         <br>
+                        {% end %}
                         <button data-file="{{ backup['path'] }}"
                           data-backup_location="{{ data['backup_config']['backup_location'] }}"
                           class="btn btn-danger del_button">
@@ -566,7 +568,7 @@
     });
 
     $(".download").click(async function () {
-      let file = $(".download").data("file");
+      let file = $(this).data("file");
       window.open(`/api/v2/servers/${serverId}/backups/backup/${backup_id}/download/${encodeURIComponent(file)}`, '_blank');
     });