diff --git a/pkg/pwa/pwa.go b/pkg/pwa/pwa.go
index ce7af06..71131e6 100644
--- a/pkg/pwa/pwa.go
+++ b/pkg/pwa/pwa.go
@@ -217,7 +217,9 @@ func (p *pwaClient) DownloadAndPackagePWA(pwaURL, manifestURL string, bar *progr
 		if path == "" {
 			path = "index.html"
 		}
+		mu.Lock()
 		dn.AddData(path, body)
+		mu.Unlock()
 
 		// Parse HTML for additional assets
 		if parseHTML && isHTMLContent(resp.Header.Get("Content-Type"), body) {
@@ -324,14 +326,11 @@ func (p *pwaClient) DownloadAndPackagePWA(pwaURL, manifestURL string, bar *progr
 		wg.Add(1)
 		go downloadAndAdd(page, true)
 	}
-	wg.Wait()
 
 	// Download remaining assets
 	for _, asset := range assetsToDownload {
-		if !downloaded[asset] {
-			wg.Add(1)
-			go downloadAndAdd(asset, false)
-		}
+		wg.Add(1)
+		go downloadAndAdd(asset, false)
 	}
 	wg.Wait()