diff --git a/CHANGELOG.md b/CHANGELOG.md
index 065a64ee63..231ae0ebef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
   * Fixed an issue where empty `PolicyRules` would throw an exception during Get.
 * EXOPlace
   * Fixes an issue with the export where it was trying to export RoomList.
+* PPTenantSettings
+  * Changed type of `EnableDesktopFlowDataPolicyManagement` property from String to Boolean to avoid errors or warnings
+    FIXES [#6740](https://github.com/microsoft/Microsoft365DSC/issues/6740)
 * MISC
   * Removed verbose output from `Get-TargetResource`.
   * Updated the error behavior to always throw inside `Get-TargetResource`.
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1
index 1d8b49a1d7..3435a9c2c5 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.psm1
@@ -125,7 +125,7 @@ function Get-TargetResource
         $EnableDefaultEnvironmentRouting,
 
         [Parameter()]
-        [System.String]
+        [System.Boolean]
         $EnableDesktopFlowDataPolicyManagement,
 
         [Parameter()]
@@ -485,7 +485,7 @@ function Set-TargetResource
         $EnableDefaultEnvironmentRouting,
 
         [Parameter()]
-        [System.String]
+        [System.Boolean]
         $EnableDesktopFlowDataPolicyManagement,
 
         [Parameter()]
@@ -1065,17 +1065,10 @@ function Get-M365DSCPowerPlatformTenantSettings
 
     if ($null -ne $EnableDesktopFlowDataPolicyManagement)
     {
-        try
-        {
-            $policy = @{
-                enableDesktopFlowDataPolicyManagement = [Boolean]::Parse($Parameters.EnableDesktopFlowDataPolicyManagement)
-            }
-            $governance.Add('policy', $policy)
-        }
-        catch
-        {
-            Write-Verbose -Message $_
+        $policy = @{
+            enableDesktopFlowDataPolicyManagement = $Parameters.EnableDesktopFlowDataPolicyManagement
         }
+        $governance.Add('policy', $policy)
     }
     $result.powerplatform.Add('governance', $governance)
 
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof
index 59ebf64a14..9e09e8fb02 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof
@@ -15,7 +15,7 @@ class MSFT_PPTenantSettings : OMI_BaseResource
     [Write, Description("Restrict all developer environments to be created by tenant admins, Power Platform admins, or Dynamics 365 service admins. Default is false.")] Boolean DisableDeveloperEnvironmentCreationByNonAdminUsers;
     [Write, Description("TBD")] Boolean EnvironmentRoutingAllMakers;
     [Write, Description("Enables the Default Environment routing feature that creates personal, developer environments for new makers. Default value is false.")] Boolean EnableDefaultEnvironmentRouting;
-    [Write, Description("When this setting is true, admins can view and manage desktop flow action groups in DLP policies in the Power Platform admin center. Default value is false.")] String EnableDesktopFlowDataPolicyManagement;
+    [Write, Description("When this setting is true, admins can view and manage desktop flow action groups in DLP policies in the Power Platform admin center. Default value is false.")] Boolean EnableDesktopFlowDataPolicyManagement;
     [Write, Description("Allow users to collect telemetry data about their app in Azure Application Insights. Setting this to False blocks the transmission of this data.")] Boolean EnableCanvasAppInsights;
     [Write, Description("Allow people to create a canvas app based on a Figma file. Default value is false.")] Boolean DisableCreateFromFigma;