diff --git a/dali/ft/filecopy.cpp b/dali/ft/filecopy.cpp
index dc25e283d68..641bf111e62 100644
--- a/dali/ft/filecopy.cpp
+++ b/dali/ft/filecopy.cpp
@@ -1597,13 +1597,12 @@ void FileSprayer::commonUpSlaves()
 
     // noCommon is defaulted to on for non-containerized (revisit!)
     bool noCommon = options->getPropBool(ANnocommon, !isContainerized());
-    if (isContainerized() && noCommon)
+    if (noCommon)
     {
+        if (!isContainerized())
+            return;
         IWARNLOG("Ignoring noCommon option in containerized mode");
-        noCommon = false;
     }
-    else if (noCommon)
-        return;
 
     //First work out which are the same slaves, and then map the partition.
     //Previously it was n^2 in partition, which is fine until you spray 100K files.