diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 716bd28d95..762fcf8966 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -701,7 +701,13 @@ bool FolderMan::startFromScratch( const QString& localFolder )
         // Disconnect the socket api from the database to avoid that locking of the
         // db file does not allow to move this dir.
         if( _socketApi ) {
-            _socketApi->slotUnregisterPath(localFolder);
+            foreach( Folder *f, _folderMap.values() ) {
+                if(f) {
+                    if( localFolder.startsWith(f->path()) ) {
+                        _socketApi->slotUnregisterPath(f->alias());
+                    }
+                }
+            }
         }
 
         // Make a backup of the folder/file.