diff --git a/sdk/client/pollers/poller.go b/sdk/client/pollers/poller.go
index d468fa5f0f5..1601d28dcc8 100644
--- a/sdk/client/pollers/poller.go
+++ b/sdk/client/pollers/poller.go
@@ -108,7 +108,7 @@ func (p *Poller) PollUntilDone(ctx context.Context) error {
 	go func() {
 		connectionDropCounter := 0
 		retryDuration := p.initialDelayDuration
-		for true {
+		for {
 			// determine the next retry duration / how long to poll for
 			if p.latestResponse != nil {
 				retryDuration = p.latestResponse.PollInterval
@@ -129,7 +129,7 @@ func (p *Poller) PollUntilDone(ctx context.Context) error {
 				// connection drops can either have no response/error (where we have no context)
 				connectionHasBeenDropped = true
 			} else if _, ok := p.latestError.(PollingDroppedConnectionError); ok {
-				// or have an error with more details (e.g. server not found, connection reset etc)
+				// or have an error with more details (e.g. server not found, connection reset etc.)
 				connectionHasBeenDropped = true
 			}
 			if connectionHasBeenDropped {
diff --git a/sdk/client/resourcemanager/poller_lro.go b/sdk/client/resourcemanager/poller_lro.go
index 3876b7b11a7..1ecc8986071 100644
--- a/sdk/client/resourcemanager/poller_lro.go
+++ b/sdk/client/resourcemanager/poller_lro.go
@@ -15,8 +15,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-sdk/sdk/client"
 	"github.com/hashicorp/go-azure-sdk/sdk/client/pollers"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 var _ pollers.PollerType = &longRunningOperationPoller{}
@@ -77,6 +79,14 @@ func (p *longRunningOperationPoller) Poll(ctx context.Context) (result *pollers.
 		return nil, fmt.Errorf("internal error: cannot poll without a pollingUrl")
 	}
 
+	// Retry the polling operation if a 404 was returned
+	retryOn404 := func(resp *http.Response, _ *odata.OData) (bool, error) {
+		if resp != nil && response.WasStatusCode(resp, http.StatusNotFound) {
+			return true, nil
+		}
+		return false, nil
+	}
+
 	reqOpts := client.RequestOptions{
 		ContentType: "application/json; charset=utf-8",
 		ExpectedStatusCodes: []int{
@@ -88,6 +98,7 @@ func (p *longRunningOperationPoller) Poll(ctx context.Context) (result *pollers.
 		HttpMethod:    http.MethodGet,
 		OptionsObject: nil,
 		Path:          p.pollingUrl.Path,
+		RetryFunc:     client.RequestRetryAny(append(defaultRetryFunctions, retryOn404)...),
 	}
 
 	// TODO: port over the `api-version` header
@@ -98,9 +109,6 @@ func (p *longRunningOperationPoller) Poll(ctx context.Context) (result *pollers.
 	}
 	req.URL.RawQuery = p.pollingUrl.RawQuery
 
-	// Custom RetryFunc to inspect the operation payload and check the status
-	req.RetryFunc = client.RequestRetryAny(defaultRetryFunctions...)
-
 	result = &pollers.PollResult{
 		PollInterval: p.initialRetryDuration,
 	}