diff --git a/Extensions/EndpointManager.psm1 b/Extensions/EndpointManager.psm1
index 12ecf86..b6da6d6 100644
--- a/Extensions/EndpointManager.psm1
+++ b/Extensions/EndpointManager.psm1
@@ -157,6 +157,7 @@ function Invoke-InitializeModule
         PreImportCommand = { Start-PreImportConditionalAccess @args }
         PostExportCommand = { Start-PostExportConditionalAccess  @args }
         ExpandAssignmentsList = $false
+        PageSize = "Skip"
     })
 
     Add-ViewItem (New-Object PSObject -Property @{
diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1
index 96ace73..c756ef0 100644
--- a/Extensions/MSGraph.psm1
+++ b/Extensions/MSGraph.psm1
@@ -851,8 +851,18 @@ function Show-GraphObjects
 
     $params = @{}
     $pageSize = 0
-    $tmpPageSize = Get-SettingValue "GraphPageSize"
-    if ($tmpPageSize -eq "All")
+    if($global:curObjectType.PageSize)
+    {
+        $tmpPageSize = $global:curObjectType.PageSize
+    }
+    else {        
+        $tmpPageSize = Get-SettingValue "GraphPageSize"
+    }
+
+    if($tmpPageSize -eq "Skip") {
+        # Do nothing - use default page size from API
+    }
+    elseif ($tmpPageSize -eq "All")
     {
         $params.Add("AllPages", $true)        
     }else