diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md
deleted file mode 100644
index 9020342e7420..000000000000
--- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
-
-Code generator @microsoft.azure/autorest.go@~2.1.161
-
-## Breaking Changes
-
-- Function `NewResourceListPage` parameter(s) have been changed from `(func(context.Context, ResourceList) (ResourceList, error))` to `(ResourceList, func(context.Context, ResourceList) (ResourceList, error))`
-- Function `NewOperationListPage` parameter(s) have been changed from `(func(context.Context, OperationList) (OperationList, error))` to `(OperationList, func(context.Context, OperationList) (OperationList, error))`
-- Function `NewUsageListPage` parameter(s) have been changed from `(func(context.Context, UsageList) (UsageList, error))` to `(UsageList, func(context.Context, UsageList) (UsageList, error))`
-- Function `NewPrivateLinkResourceListPage` parameter(s) have been changed from `(func(context.Context, PrivateLinkResourceList) (PrivateLinkResourceList, error))` to `(PrivateLinkResourceList, func(context.Context, PrivateLinkResourceList) (PrivateLinkResourceList, error))`
diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/operations.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/operations.go
index dba0ab956b85..0518c68f3e35 100644
--- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/operations.go
+++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/operations.go
@@ -74,6 +74,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListPa
 	}
 	if result.ol.hasNextLink() && result.ol.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -129,7 +130,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "signalr.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/privatelinkresources.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/privatelinkresources.go
index 47bfb94839dc..6f0b1d6f65df 100644
--- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/privatelinkresources.go
+++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/privatelinkresources.go
@@ -79,6 +79,7 @@ func (client PrivateLinkResourcesClient) List(ctx context.Context, resourceGroup
 	}
 	if result.plrl.hasNextLink() && result.plrl.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -140,7 +141,6 @@ func (client PrivateLinkResourcesClient) listNextResults(ctx context.Context, la
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "signalr.PrivateLinkResourcesClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go
index da0034534af4..ffc677833fdc 100644
--- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go
+++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go
@@ -410,6 +410,7 @@ func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName
 	}
 	if result.rl.hasNextLink() && result.rl.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -470,7 +471,6 @@ func (client Client) listByResourceGroupNextResults(ctx context.Context, lastRes
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "signalr.Client", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -524,6 +524,7 @@ func (client Client) ListBySubscription(ctx context.Context) (result ResourceLis
 	}
 	if result.rl.hasNextLink() && result.rl.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -583,7 +584,6 @@ func (client Client) listBySubscriptionNextResults(ctx context.Context, lastResu
 	result, err = client.ListBySubscriptionResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "signalr.Client", "listBySubscriptionNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go
index a19450cc04e2..7261daae670f 100644
--- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go
+++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go
@@ -76,6 +76,7 @@ func (client UsagesClient) List(ctx context.Context, location string) (result Us
 	}
 	if result.ul.hasNextLink() && result.ul.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -136,7 +137,6 @@ func (client UsagesClient) listNextResults(ctx context.Context, lastResults Usag
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "signalr.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }