diff --git a/packages/desktop/build.rs b/packages/desktop/build.rs
index bd7445637..770ebd2d6 100644
--- a/packages/desktop/build.rs
+++ b/packages/desktop/build.rs
@@ -26,7 +26,9 @@ fn main() {
         }
       }
     }"#;
-    let mut interpreter = SLEDGEHAMMER_JS.replace("/*POST_HANDLE_EDITS*/", prevent_file_upload);
+    let mut interpreter = SLEDGEHAMMER_JS
+        .replace("/*POST_HANDLE_EDITS*/", prevent_file_upload)
+        .replace("export", "");
     while let Some(import_start) = interpreter.find("import") {
         let import_end = interpreter[import_start..]
             .find(|c| c == ';' || c == '\n')
diff --git a/packages/liveview/build.rs b/packages/liveview/build.rs
index b62a09da0..824bc4f70 100644
--- a/packages/liveview/build.rs
+++ b/packages/liveview/build.rs
@@ -40,8 +40,9 @@ fn main() {
               return;
             }
           }"#;
-    let mut interpreter =
-        SLEDGEHAMMER_JS.replace("/*POST_EVENT_SERIALIZATION*/", serialize_file_uploads);
+    let mut interpreter = SLEDGEHAMMER_JS
+        .replace("/*POST_EVENT_SERIALIZATION*/", serialize_file_uploads)
+        .replace("export", "");
     while let Some(import_start) = interpreter.find("import") {
         let import_end = interpreter[import_start..]
             .find(|c| c == ';' || c == '\n')
diff --git a/packages/liveview/src/query.rs b/packages/liveview/src/query.rs
index a638625c1..c99dd5151 100644
--- a/packages/liveview/src/query.rs
+++ b/packages/liveview/src/query.rs
@@ -169,10 +169,7 @@ pub(crate) struct Query<V: DeserializeOwned> {
 impl<V: DeserializeOwned> Query<V> {
     /// Resolve the query
     pub async fn resolve(mut self) -> Result<V, QueryError> {
-        match self.receiver.recv().await {
-            Some(result) => V::deserialize(result).map_err(QueryError::Deserialize),
-            None => Err(QueryError::Recv(RecvError::Closed)),
-        }
+        V::deserialize(self.result().await?).map_err(QueryError::Deserialize)
     }
 
     /// Send a message to the query