diff --git a/src/lime/tools/AssetHelper.hx b/src/lime/tools/AssetHelper.hx
index 79bab9df74..aa8c80fd1b 100644
--- a/src/lime/tools/AssetHelper.hx
+++ b/src/lime/tools/AssetHelper.hx
@@ -410,6 +410,11 @@ class AssetHelper
 
 	public static function processLibraries(project:HXProject, targetDirectory:String = null):Void
 	{
+		if(project.haxedefs.exists("custom_assets"))
+		{
+			return;
+		}
+		
 		var hasManifest = new Map<String, Bool>();
 		var libraryMap = new Map<String, Bool>();
 
@@ -551,7 +556,7 @@ class AssetHelper
 			processPackedLibraries(project, targetDirectory);
 		}
 
-		if (project.assets.length == 0)
+		if (project.assets.length == 0 && !project.haxedefs.exists("custom_assets"))
 		{
 			project.haxedefs.set("disable_preloader_assets", "1");
 		}
diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx
index aa79825e61..a21d99458b 100644
--- a/src/lime/tools/ProjectXMLParser.hx
+++ b/src/lime/tools/ProjectXMLParser.hx
@@ -453,6 +453,11 @@ class ProjectXMLParser extends HXProject
 
 	private function parseAssetsElement(element:Access, basePath:String = "", isTemplate:Bool = false):Void
 	{
+		if(!isTemplate && haxedefs.exists("custom_assets"))
+		{
+			return;
+		}
+		
 		var path = "";
 		var embed:Null<Bool> = null;
 		var library = null;