diff --git a/app/Controller.inc b/app/Controller.inc
index 461c9fd1..e198a6d6 100644
--- a/app/Controller.inc
+++ b/app/Controller.inc
@@ -65,7 +65,8 @@
 			parent::preFilter($request, $response);
 			
 			// Create linker
-			$this->linker = new \nre\core\Linker($this->request);
+			$this->linker = new \nre\core\Linker($request);
+			$this->set('linker', $this->linker);
 			
 			// Create text formatter
 			$this->set('t', new \hhu\z\TextFormatter($this->linker));
diff --git a/core/Controller.inc b/core/Controller.inc
index 941e7523..47b5e0a5 100644
--- a/core/Controller.inc
+++ b/core/Controller.inc
@@ -165,10 +165,6 @@
 			// Response speichern
 			$this->response = $response;
 			
-			
-			// Linker erstellen
-			$this->set('linker', new \nre\core\Linker($request));
-			
 		}