diff --git a/CHANGELOG.org b/CHANGELOG.org
index 853f05f2cd..cac2cabeb2 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -17,6 +17,7 @@
   * Replace the per-interface ~(INTERFACE ...)~ pcase forms with a single,
     unified ~(lsp-interface INTERFACE ...)~ form. The per-interface forms are no
     longer generated. *This is a breaking change.* (See #4430.)
+  * If asm-lsp is installed, lsp-asm won't try to download it to cache store
 
 ** 9.0.0
   * Add language server config for QML (Qt Modeling Language) using qmlls.
diff --git a/clients/lsp-asm.el b/clients/lsp-asm.el
index 578558242b..bd7eddf8a9 100644
--- a/clients/lsp-asm.el
+++ b/clients/lsp-asm.el
@@ -81,7 +81,8 @@ Will update if UPDATE? is t."
  (make-lsp-client
   :new-connection (lsp-stdio-connection
                    #'lsp-asm--server-command
-                   (lambda () (f-exists? lsp-asm-store-path)))
+                   (lambda () (or (executable-find "asm-lsp")
+                                  (f-exists? lsp-asm-store-path))))
   :major-modes lsp-asm-active-modes
   :priority -1
   :server-id 'asm-lsp