diff --git a/eng/CodeGeneration.targets b/eng/CodeGeneration.targets
index a406364a84bfd..2423c7250767f 100644
--- a/eng/CodeGeneration.targets
+++ b/eng/CodeGeneration.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6236/autorest-3.0.6236.tgz</_AutoRestVersion>
     <_AutoRestCoreVersion>3.0.6306</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200826.1/autorest-csharp-v3-3.0.0-dev.20200826.1.tgz</_AutoRestCSharpVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200909.1/autorest-csharp-v3-3.0.0-dev.20200909.1.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
     <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
@@ -59,3 +59,4 @@
 
 
 
+
diff --git a/sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs
index b890083765c96..a0ea80ba24d28 100644
--- a/sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs
@@ -43,7 +43,13 @@ public FuncAsyncPageable(AsyncPageFunc<T> firstPageFunc, AsyncPageFunc<T>? nextP
 
             public override async IAsyncEnumerable<Page<T>> AsPages(string? continuationToken = default, int? pageSizeHint = default)
             {
-                AsyncPageFunc<T>? pageFunc = _firstPageFunc;
+                AsyncPageFunc<T>? pageFunc = string.IsNullOrEmpty(continuationToken) ? _firstPageFunc : _nextPageFunc;
+
+                if (pageFunc == null)
+                {
+                    yield break;
+                }
+
                 int? pageSize = pageSizeHint ?? _defaultPageSize;
                 do
                 {
@@ -70,7 +76,13 @@ public FuncPageable(PageFunc<T> firstPageFunc, PageFunc<T>? nextPageFunc, int? d
 
             public override IEnumerable<Page<T>> AsPages(string? continuationToken = default, int? pageSizeHint = default)
             {
-                PageFunc<T>? pageFunc = _firstPageFunc;
+                PageFunc<T>? pageFunc = string.IsNullOrEmpty(continuationToken) ? _firstPageFunc : _nextPageFunc;
+
+                if (pageFunc == null)
+                {
+                    yield break;
+                }
+
                 int? pageSize = pageSizeHint ?? _defaultPageSize;
                 do
                 {