diff --git a/History.md b/History.md
index f4cf7f391..ebcc17c23 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,7 @@
 * Adding view counter (thanks @steffenstraetz! See [PR #489](https://github.com/TelescopeJS/Telescope/pull/489))
 * Splitting out `router.js` in multiple files.
 * URL can now be removed when editing a post (thanks @massimilianomarini! See [PR 484](https://github.com/TelescopeJS/Telescope/pull/484)).
+* Now waiting on `allUsersAdmin` subscription for post submit page (thanks @kai101! See [PR 508](https://github.com/TelescopeJS/Telescope/pull/508))
 
 ## v0.9.8
 
diff --git a/lib/router/posts.js b/lib/router/posts.js
index 501545d9b..929bb7475 100644
--- a/lib/router/posts.js
+++ b/lib/router/posts.js
@@ -241,6 +241,9 @@ Meteor.startup(function () {
   Router.route('/submit', {
     name: 'post_submit',
     template: getTemplate('post_submit'),
+    waitOn: function () {
+      return coreSubscriptions.subscribe('allUsersAdmin');
+    }
   });
 
 });
\ No newline at end of file