diff --git a/packages/uhk-agent/src/services/smart-macro-doc.service.ts b/packages/uhk-agent/src/services/smart-macro-doc.service.ts
index bbd76c8bbdb..d7903bd3623 100644
--- a/packages/uhk-agent/src/services/smart-macro-doc.service.ts
+++ b/packages/uhk-agent/src/services/smart-macro-doc.service.ts
@@ -165,7 +165,10 @@ export class SmartMacroDocService {
                 return this.fallbackToBundledFirmware(event);
             }
 
-            return this.downloadDocumentation(event, firmwareRepoInfo);
+            // `await` is required so that a rejection from downloadDocumentation is caught here
+            // instead of escaping. This happens e.g. with development firmware whose git tag does
+            // not exist on GitHub, in which case we fall back to the bundled firmware grammar.
+            return await this.downloadDocumentation(event, firmwareRepoInfo);
         } catch (error) {
             this.logService.error(serviceLogMessage('download running firmware documentation failed'), error);
             return this.fallbackToBundledFirmware(event);
diff --git a/packages/uhk-web/package-lock.json b/packages/uhk-web/package-lock.json
index 3881c02fce0..f0604c00e95 100644
--- a/packages/uhk-web/package-lock.json
+++ b/packages/uhk-web/package-lock.json
@@ -47,7 +47,7 @@
         "dragula": "3.7.3",
         "gramli-angular-notifier": "18.0.0",
         "monaco-editor": "0.55.1",
-        "naive-autocompletion-parser": "1.1.9",
+        "naive-autocompletion-parser": "1.1.11",
         "ng2-dragula": "7.0.0",
         "ng2-nouislider": "2.0.0",
         "ngrx-store-freeze": "0.2.4",
@@ -11602,9 +11602,9 @@
       }
     },
     "node_modules/naive-autocompletion-parser": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/naive-autocompletion-parser/-/naive-autocompletion-parser-1.1.9.tgz",
-      "integrity": "sha512-F7iVXFF8KTdCAt2xI7rQj0wpjNB6a7FYcQoiAeQKLn8mhWMxSkTy5teRYr3dccQ2L0ySDhNjravw4PUHajn5SA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/naive-autocompletion-parser/-/naive-autocompletion-parser-1.1.11.tgz",
+      "integrity": "sha512-tV4obf/VZx76AiEeQd3XS8iQPsB5oXPOX/Ja+Q0dGJit4+bVWJubnkKTm8oy17/qEpAx9HYdYI2r5z779gLRCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/packages/uhk-web/package.json b/packages/uhk-web/package.json
index 593a4e8239c..427d0fefbb5 100644
--- a/packages/uhk-web/package.json
+++ b/packages/uhk-web/package.json
@@ -51,7 +51,7 @@
     "dragula": "3.7.3",
     "gramli-angular-notifier": "18.0.0",
     "monaco-editor": "0.55.1",
-    "naive-autocompletion-parser": "1.1.9",
+    "naive-autocompletion-parser": "1.1.11",
     "ng2-dragula": "7.0.0",
     "ng2-nouislider": "2.0.0",
     "ngrx-store-freeze": "0.2.4",