diff --git a/Source/Tools/Flax.Build/Build/Platform.cs b/Source/Tools/Flax.Build/Build/Platform.cs
index f64dc6ab9..6416a2914 100644
--- a/Source/Tools/Flax.Build/Build/Platform.cs
+++ b/Source/Tools/Flax.Build/Build/Platform.cs
@@ -196,7 +196,7 @@ namespace Flax.Build
         /// <returns><c>true</c> if this platform can build the specified architecture; otherwise, <c>false</c>.</returns>
         public virtual bool CanBuildArchitecture(TargetArchitecture targetArchitecture)
         {
-            return IsPlatformSupported(Target, targetArchitecture);
+            return IsPlatformSupported(Target, targetArchitecture) && HasRequiredSDKsInstalled;
         }
 
         /// <summary>
@@ -332,7 +332,7 @@ namespace Flax.Build
 
             switch (targetPlatform)
             {
-            case TargetPlatform.Windows: return targetArchitecture == TargetArchitecture.x64 || targetArchitecture == TargetArchitecture.x86 || targetArchitecture == TargetArchitecture.ARM64;
+            case TargetPlatform.Windows: return targetArchitecture == TargetArchitecture.x64 || targetArchitecture == TargetArchitecture.ARM64;
             case TargetPlatform.XboxScarlett: return targetArchitecture == TargetArchitecture.x64;
             case TargetPlatform.XboxOne: return targetArchitecture == TargetArchitecture.x64;
             case TargetPlatform.UWP: return targetArchitecture == TargetArchitecture.x64;
diff --git a/Source/Tools/Flax.Build/Deps/DepsBuilder.cs b/Source/Tools/Flax.Build/Deps/DepsBuilder.cs
index 1b8389080..58d785870 100644
--- a/Source/Tools/Flax.Build/Deps/DepsBuilder.cs
+++ b/Source/Tools/Flax.Build/Deps/DepsBuilder.cs
@@ -42,7 +42,7 @@ namespace Flax.Deps
             var architectures = Globals.AllArchitectures;
             if (Configuration.BuildArchitectures != null && Configuration.BuildArchitectures.Length != 0)
                 architectures = Configuration.BuildArchitectures;
-            architectures = architectures.Where(buildPlatform.CanBuildArchitecture).ToArray();
+            architectures = architectures.Where(x => platforms.Any(y => Platform.GetPlatform(y, true)?.CanBuildArchitecture(x) ?? false)).ToArray();
             Log.Verbose($"Building deps for platforms {string.Join(',', platforms)}, {string.Join(',', architectures)}:");
             foreach (var platform in platforms)
             {