diff --git a/static/js/managers/DownloadManager.js b/static/js/managers/DownloadManager.js
index 8ffd4027..aa606c3a 100644
--- a/static/js/managers/DownloadManager.js
+++ b/static/js/managers/DownloadManager.js
@@ -42,6 +42,8 @@ export class DownloadManager {
         this.versions = [];
         this.modelInfo = null;
         this.modelVersionId = null;
+        // Add this line to reset selectedFolder
+        this.selectedFolder = '';  // Reset selectedFolder when starting new download
     }
 
     async validateAndFetchVersions() {
@@ -224,7 +226,6 @@ export class DownloadManager {
                 throw new Error(await response.text());
             }
 
-            const result = await response.json();
             showToast('Download completed successfully', 'success');
             modalManager.closeModal('downloadModal');
             
diff --git a/templates/components/modals.html b/templates/components/modals.html
index 54d52d4c..57a5f194 100644
--- a/templates/components/modals.html
+++ b/templates/components/modals.html
@@ -55,9 +55,11 @@
                     <div class="folder-browser" id="folderBrowser">
                         <!-- Folders will be dynamically inserted here -->
                         {% for folder in folders %}
-                        <div class="folder-item" data-folder="{{ folder }}">
-                            {{ folder }}
-                        </div>
+                            {% if folder %}
+                            <div class="folder-item" data-folder="{{ folder }}">
+                                {{ folder }}
+                            </div>
+                            {% endif %}
                         {% endfor %}
                     </div>
                 </div>