diff --git a/copyparty/__version__.py b/copyparty/__version__.py
index 75e05e8f..2cc1db98 100644
--- a/copyparty/__version__.py
+++ b/copyparty/__version__.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-VERSION = (0, 9, 11)
+VERSION = (0, 9, 12)
 CODENAME = "the strongest music server"
 BUILD_DT = (2021, 3, 23)
 
diff --git a/copyparty/up2k.py b/copyparty/up2k.py
index 8c4fb542..daef233d 100644
--- a/copyparty/up2k.py
+++ b/copyparty/up2k.py
@@ -288,9 +288,9 @@ class Up2k(object):
         self.pp.n = next(dbw[0].execute("select count(w) from up"))[0]
 
         excl = [
-            vol.realpath + d.vpath[len(vol.vpath) :]
+            vol.realpath + "/" + d.vpath[len(vol.vpath) :].lstrip("/")
             for d in all_vols
-            if d.vpath.startswith(vol.vpath + "/")
+            if d != vol and (d.vpath.startswith(vol.vpath + "/") or not vol.vpath)
         ]
         n_add = self._build_dir(dbw, top, set(excl), top)
         n_rm = self._drop_lost(dbw[0], top)