diff --git a/Directory.Build.props b/Directory.Build.props
index 425f6320cf..7fc6d42c5d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
     <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
     <VersionPrefix>5.7.1</VersionPrefix>
     <VersionSuffix>pre</VersionSuffix>
-    <OpenApiPreviewNumber>1</OpenApiPreviewNumber>
+    <OpenApiPreviewNumber>2</OpenApiPreviewNumber>
     <NuGetAuditMode>direct</NuGetAuditMode>
   </PropertyGroup>
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Client.Kiota/Build/JsonApiDotNetCore.OpenApi.Client.Kiota.targets b/src/JsonApiDotNetCore.OpenApi.Client.Kiota/Build/JsonApiDotNetCore.OpenApi.Client.Kiota.targets
index 72b32aa7a5..44586a10ae 100644
--- a/src/JsonApiDotNetCore.OpenApi.Client.Kiota/Build/JsonApiDotNetCore.OpenApi.Client.Kiota.targets
+++ b/src/JsonApiDotNetCore.OpenApi.Client.Kiota/Build/JsonApiDotNetCore.OpenApi.Client.Kiota.targets
@@ -149,8 +149,8 @@
   </Target>
 
   <!-- Include **/*.cs from output directory afterward, so that MSBuild properly refreshes if .cs files appear/disappear when openapi.json file changed -->
-  <Target Name="_KiotaIncludeGeneratedCode" Condition="'$(DesignTimeBuild)' != 'true' And '$(BuildingProject)' == 'true'" DependsOnTargets="_KiotaRunTool"
-    BeforeTargets="BeforeCompile;CoreCompile">
+  <Target Name="_KiotaIncludeGeneratedCode" Condition="'$(DesignTimeBuild)' != 'true' And '$(BuildingProject)' == 'true' And '@(KiotaReference)' != ''"
+    DependsOnTargets="_KiotaRunTool" BeforeTargets="BeforeCompile;CoreCompile">
     <ItemGroup>
       <_WildcardGroup Include="%2A%2A/%2A.cs">
         <GeneratedCodeDirectory>%(KiotaReference._NonEmptyOutputPath)</GeneratedCodeDirectory>