diff --git a/src/server/index.tsx b/src/server/index.tsx
index f8876fa6..f55d68c2 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -26,6 +26,7 @@ import {
   favIconUrl,
   initializeSite,
   isAuthPath,
+  md,
 } from "../shared/utils";
 
 const server = express();
@@ -353,7 +354,9 @@ async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) {
   <!DOCTYPE html>
   <html ${helmet.htmlAttributes.toString()} lang="en">
   <head>
-  <script>window.isoData = ${JSON.stringify(isoData)}</script>
+  <script>window.isoData = ${md.utils.escapeHtml(
+    JSON.stringify(isoData)
+  )}</script>
   <script>window.lemmyConfig = ${serialize(config)}</script>
 
   <!-- A remote debugging utility for mobile -->
diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index 215a7bdd..ff0bab91 100644
--- a/src/shared/components/post/post-form.tsx
+++ b/src/shared/components/post/post-form.tsx
@@ -488,6 +488,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
 
     const pForm = i.state.form;
     const pv = i.props.post_view;
+    
     if (pv) {
       i.props.onEdit?.({
         name: pForm.name,
@@ -495,7 +496,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
         body: pForm.body,
         nsfw: pForm.nsfw,
         post_id: pv.post.id,
-        language_id: pv.post.language_id,
+        language_id: pForm.language_id,
         auth,
       });
     } else if (pForm.name && pForm.community_id) {
