diff --git a/src/server/index.tsx b/src/server/index.tsx
index 33cfe57f..e7278d6b 100644
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -24,7 +24,7 @@ server.use('/static', express.static(path.resolve('./dist')));
 // server.use(cookieParser());
 
 server.get('/*', async (req, res) => {
-  const activeRoute = routes.find(route => matchPath(req.url, route)) || {};
+  const activeRoute = routes.find(route => matchPath(req.path, route)) || {};
   const context = {} as any;
   let auth: string = IsomorphicCookie.load('jwt', req);
 
diff --git a/src/shared/components/post-form.tsx b/src/shared/components/post-form.tsx
index 6137f53a..5c3c7539 100644
--- a/src/shared/components/post-form.tsx
+++ b/src/shared/components/post-form.tsx
@@ -524,17 +524,6 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
   }
 
   setupCommunities() {
-    if (this.props.post) {
-      this.state.postForm.community_id = this.props.post.community_id;
-    } else if (this.props.params && this.props.params.community) {
-      let foundCommunityId = this.props.communities.find(
-        r => r.name == this.props.params.community
-      ).id;
-      this.state.postForm.community_id = foundCommunityId;
-    } else {
-      // By default, the null valued 'Select a Community'
-    }
-
     // Set up select searching
     if (isBrowser()) {
       let selectId: any = document.getElementById('post-community');
@@ -580,6 +569,23 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
         );
       }
     }
+
+    if (this.props.post) {
+      this.state.postForm.community_id = this.props.post.community_id;
+    } else if (this.props.params && this.props.params.community) {
+      let foundCommunityId = this.props.communities.find(
+        r => r.name == this.props.params.community
+      ).id;
+      this.state.postForm.community_id = foundCommunityId;
+      if (isBrowser()) {
+        this.choices.setChoiceByValue(
+          this.state.postForm.community_id.toString()
+        );
+      }
+      this.setState(this.state);
+    } else {
+      // By default, the null valued 'Select a Community'
+    }
   }
 
   parseMessage(msg: WebSocketJsonResponse) {