diff --git a/rhodecode/lib/middleware/simplevcs.py b/rhodecode/lib/middleware/simplevcs.py
--- a/rhodecode/lib/middleware/simplevcs.py
+++ b/rhodecode/lib/middleware/simplevcs.py
@@ -242,11 +242,9 @@ class SimpleVCS(object):
         environ['pylons.status_code_redirect'] = True
 
         # ======================================================================
-        # EXTRACT REPOSITORY NAME FROM ENV
+        # EXTRACT REPOSITORY NAME FROM ENV SET IN `class VCSMiddleware`
         # ======================================================================
-        environ['PATH_INFO'] = self._get_by_id(environ['PATH_INFO'])
-        repo_name = self._get_repository_name(environ)
-        environ['REPO_NAME'] = repo_name
+        repo_name = environ['REPO_NAME']
         log.debug('Extracted repo name is %s', repo_name)
 
         # check for type, presence in database and on filesystem
diff --git a/rhodecode/lib/middleware/vcs.py b/rhodecode/lib/middleware/vcs.py
--- a/rhodecode/lib/middleware/vcs.py
+++ b/rhodecode/lib/middleware/vcs.py
@@ -159,7 +159,12 @@ class VCSMiddleware(object):
             app = SimpleSvn(self.application, self.config, self.registry)
 
         if app:
+            # translate the _REPO_ID into real repo NAME for usage
+            # in midddleware
+            environ['PATH_INFO'] = app._get_by_id(environ['PATH_INFO'])
             repo_name = app._get_repository_name(environ)
+            environ['REPO_NAME'] = repo_name
+
             self.repo_vcs_config = self.vcs_config(repo_name)
             app.repo_vcs_config = self.repo_vcs_config