diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index ca50189d..221f91ff 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -119,9 +119,13 @@ export default {
 			}
 
 			// Display internal posts
+			let account = this.item.local ? this.item.actor_info.preferredUsername : this.item.actor_info.account
+			let postId = this.item.id.split('/')[this.item.id.split('/').length - 1]
 			this.$router.push({ name: 'single-post',
 				params: {
+					account: account,
 					id: this.item.id,
+					localId: postId,
 					type: 'single-post'
 				}
 			})
diff --git a/src/router.js b/src/router.js
index 0c3792b2..aab02912 100644
--- a/src/router.js
+++ b/src/router.js
@@ -59,7 +59,7 @@ export default new Router({
 			]
 		},
 		{
-			path: '/:index(index.php/)?apps/social/post?id=:id',
+			path: '/:index(index.php/)?apps/social/:account/:localId',
 			components: {
 				default: TimelineSinglePost
 			},