Index: libs/libmythmetadata/dirscan.cpp
===================================================================
--- libs/libmythmetadata/dirscan.cpp	(revision 27376)
+++ libs/libmythmetadata/dirscan.cpp	(working copy)
@@ -128,7 +128,7 @@
         QStringList list;
         bool ok = false;
 
-        if (isMaster)
+        if (isMaster && (gCoreContext->GetHostName() == host))
         {
             StorageGroup sg("Videos", host);
             list = sg.GetFileInfoList(start_path);