diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index ae4ecd6516..1b43a717cb 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -162,8 +162,6 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 	# AddFilesToContainer <container> : <directoryTokens> : <targets>
 	#	[ : dest name ]
 	#
-	local directory = [ AddDirectoryToContainer $(container)
-		: $(directoryTokens) ] ;
 	local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
 	local systemDirTokens
 		= [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ;
@@ -192,6 +190,13 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 		}
 	}
 
+	if ! $(targets) {
+		return ;
+	}
+
+	local directory = [ AddDirectoryToContainer $(container)
+		: $(directoryTokens) ] ;
+
 	# We create a unique dummy target per target to install.
 	local installTargetsVar
 		= [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ;