diff --git a/app/routes/editor/edit.js b/app/routes/editor/edit.js
index c74974c1d5..bc9795e309 100644
--- a/app/routes/editor/edit.js
+++ b/app/routes/editor/edit.js
@@ -1,8 +1,6 @@
 /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import base from 'ghost-admin/mixins/editor-base-route';
-import isNumber from 'ghost-admin/utils/isNumber';
-import isFinite from 'ghost-admin/utils/isFinite';
 
 export default AuthenticatedRoute.extend(base, {
     titleToken: 'Editor',
@@ -14,20 +12,13 @@ export default AuthenticatedRoute.extend(base, {
     },
 
     model(params) {
-        let postId,
-            query;
-
-        postId = Number(params.post_id);
-
-        if (!isNumber(postId) || !isFinite(postId) || postId % 1 !== 0 || postId <= 0) {
-            return this.transitionTo('error404', `editor/${params.post_id}`);
-        }
-
-        query = {
-            id: postId,
+        /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
+        let query = {
+            id: params.post_id,
             status: 'all',
             staticPages: 'all'
         };
+        /* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
 
         return this.store.query('post', query).then((records) => {
             let post = records.get('firstObject');
diff --git a/app/routes/posts/post.js b/app/routes/posts/post.js
index 33646c8883..840785e7af 100644
--- a/app/routes/posts/post.js
+++ b/app/routes/posts/post.js
@@ -1,33 +1,21 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route';
-import isNumber from 'ghost-admin/utils/isNumber';
-import isFinite from 'ghost-admin/utils/isFinite';
 
 export default AuthenticatedRoute.extend(ShortcutsRoute, {
     model(params) {
-        let post,
-            postId,
-            query;
-
         /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-        postId = Number(params.post_id);
-
-        if (!isNumber(postId) || !isFinite(postId) || postId % 1 !== 0 || postId <= 0) {
-            return this.transitionTo('error404', params.post_id);
-        }
+        let post = this.store.peekRecord('post', params.post_id);
+        let query = {
+            id: params.post_id,
+            status: 'all',
+            staticPages: 'all'
+        };
         /* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
 
-        post = this.store.peekRecord('post', postId);
         if (post) {
             return post;
         }
 
-        query = {
-            id: postId,
-            status: 'all',
-            staticPages: 'all'
-        };
-
         return this.store.query('post', query).then((records) => {
             let post = records.get('firstObject');