diff --git a/rhodecode/lib/vcs/utils/helpers.py b/rhodecode/lib/vcs/utils/helpers.py
--- a/rhodecode/lib/vcs/utils/helpers.py
+++ b/rhodecode/lib/vcs/utils/helpers.py
@@ -78,6 +78,9 @@ def get_scms_for_path(path):
         if os.path.isdir(dirname):
             result.append(key)
             continue
+        dirname = os.path.join(path, 'rm__.' + key)
+        if os.path.isdir(dirname):
+            return [None]
         # We still need to check if it's not bare repository as
         # bare repos don't have working directories
         try:
diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py
--- a/rhodecode/model/scm.py
+++ b/rhodecode/model/scm.py
@@ -225,7 +225,7 @@ class ScmModel(BaseModel):
 
         for name, path in get_filesystem_repos(repos_path, recursive=True):
             # skip removed repos
-            if REMOVED_REPO_PAT.match(name):
+            if REMOVED_REPO_PAT.match(name) or path[0] is None:
                 continue
 
             # name need to be decomposed and put back together using the /