diff --git a/src/app.ts b/src/app.ts
index 23d2b0fe..13b4e6f7 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -14,9 +14,11 @@ import namespaces from './namespaces';
 
 export type AppState = DefaultState;
 
-export type AppContext = RouterContext<AppState, DatasetContext<{
+export type AppServiceContext = DatasetContext<{
   articles: Articles;
-}>>;
+}>;
+
+export type AppContext = RouterContext<AppState, AppServiceContext>;
 
 export type AppMiddleware = Middleware<AppState, AppContext>;
 
@@ -24,7 +26,7 @@ export type App = Koa<AppState, AppContext>
 
 export default (
   articles: Articles,
-  router: Router<AppState, AppContext>,
+  router: Router<AppState, AppServiceContext>,
   apiDocumentationPath: string,
   dataFactory: ExtendedDataFactory,
 ): App => {
diff --git a/src/middleware/routing.ts b/src/middleware/routing.ts
index 636b6230..6c95157c 100644
--- a/src/middleware/routing.ts
+++ b/src/middleware/routing.ts
@@ -1,22 +1,24 @@
-import Router, { RouterContext } from '@koa/router';
+import Router, { Middleware, RouterParamContext } from '@koa/router';
 import createHttpError from 'http-errors';
-import { Middleware, Next, DefaultState } from 'koa';
+import { DefaultContextExtends, DefaultStateExtends, Next } from 'koa';
 import compose from 'koa-compose';
 
-const notFound = (): Middleware<DefaultState, RouterContext> => (
-  async ({ _matchedRoute }: RouterContext, next: Next): Promise<void> => {
-    await next();
+const notFound = <State extends DefaultStateExtends, Context extends DefaultContextExtends>
+  (): Middleware<State, Context> => (
+    async ({ _matchedRoute }: RouterParamContext<State, Context>, next: Next): Promise<void> => {
+      await next();
 
-    if (typeof _matchedRoute === 'undefined') {
-      throw new createHttpError.NotFound();
+      if (typeof _matchedRoute === 'undefined') {
+        throw new createHttpError.NotFound();
+      }
     }
-  }
-);
+  );
 
-export default (router: Router): Middleware<DefaultState, RouterContext> => (
+export default <State extends DefaultStateExtends, Context extends DefaultContextExtends>
+(router: Router<State, Context>): Middleware<State, Context> => (
   compose([
     router.routes(),
-    notFound(),
+    notFound<State, Context>(),
     router.allowedMethods({ throw: true }),
   ])
 );
diff --git a/src/router.ts b/src/router.ts
index 39a240c7..585ed62b 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,13 +1,13 @@
 import Router from '@koa/router';
-import { AppContext, AppState } from './app';
+import { AppServiceContext, AppState } from './app';
 import Routes from './routes';
 import addArticle from './routes/add-article';
 import apiDocumentation from './routes/api-documentation';
 import articleList from './routes/article-list';
 import entryPoint from './routes/entry-point';
 
-export default (): Router<AppState, AppContext> => {
-  const router = new Router<AppState, AppContext>();
+export default (): Router<AppState, AppServiceContext> => {
+  const router = new Router<AppState, AppServiceContext>();
 
   router.get(Routes.ApiDocumentation, '/doc', apiDocumentation());
   router.get(Routes.ArticleList, '/articles', articleList());