diff --git a/Intento.SDK/Intento.SDK.csproj b/Intento.SDK/Intento.SDK.csproj
index fe400a0..51e7b6b 100644
--- a/Intento.SDK/Intento.SDK.csproj
+++ b/Intento.SDK/Intento.SDK.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/Intento.SDK/Translate/TranslateDynamicService.cs b/Intento.SDK/Translate/TranslateDynamicService.cs
index 0507982..8fe9502 100644
--- a/Intento.SDK/Translate/TranslateDynamicService.cs
+++ b/Intento.SDK/Translate/TranslateDynamicService.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Web;
 using Intento.SDK.Client;
+using Intento.SDK.Exceptions;
 using Intento.SDK.Logging;
 using Intento.SDK.Translate.Converters;
 using Intento.SDK.Translate.DTO;
@@ -12,6 +13,7 @@
 using Intento.SDK.Validation;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Polly;
 
 namespace Intento.SDK.Translate
 {
@@ -203,14 +205,33 @@ await Client.PostAsync<TranslateRequest, TranslateResponse>(url, request,
                     // Not a (1) - return result immediately, nothing to wait
                     return jsonResult;
                 }
-                
-                var taskCompletion = new TaskCompletionSource<bool>();
-                var wrapperTask = await Task.WhenAny(
-                    WaitAsync(taskCompletion, id, 1000),
-                    TimeoutError());
-                var wrapper = await wrapperTask;
-                taskCompletion.SetResult(true);
 
+                var wrapperResult = await Policy
+                    .Handle<Exception>().Or<IntentoApiException>()
+                    .WaitAndRetryAsync(20, _ => TimeSpan.FromSeconds(1))
+                    .ExecuteAndCaptureAsync(async () =>
+                    {
+                        var response = await CheckAsyncJobAsync(id);
+                        if (response.Done)
+                        {
+                            return response;
+                        }
+
+                        throw new IntentoException("Job is active");
+                    });
+                if (wrapperResult.FinalException != null)
+                {
+                    return new TranslateResponse
+                    {
+                        Error = new TranslationRequestError
+                        {
+                            Message = "Async operation haven't finished yet",
+                            Data = wrapperResult.FinalException.Message
+                        }
+                    };
+                }
+
+                var wrapper = wrapperResult.Result;
                 if (wrapper.Done)
                 {
                     jsonResult = wrapper.Response is { Length: > 0 } ? wrapper.Response[0] : new TranslateResponse
@@ -610,32 +631,6 @@ public async Task<TranslateResponseWrapper> CheckAsyncJobAsync(string asyncId)
             var result = await Client.GetAsync<TranslateResponseWrapper>($"operations/{asyncId}");
             return result;
         }
-        
-        private async Task<TranslateResponseWrapper> WaitAsync(TaskCompletionSource<bool> taskCompletion,
-            string asyncId, int delay = 1000)
-        {
-            await Task.WhenAny(taskCompletion.Task, Task.Delay(delay));
-            var response = await CheckAsyncJobAsync(asyncId);
-            if (response.Done)
-            {
-                return response;
-            }
-
-            return await WaitAsync(taskCompletion, asyncId, delay);
-        }
-        
-        private async Task<TranslateResponseWrapper> TimeoutError()
-        {
-            await Task.Delay(20000);
-            return new TranslateResponseWrapper
-            {
-                Done = true,
-                Error = new Error
-                {
-                    Reason = "Timeout of async operation"
-                }
-            };
-        }
 
         private string ConvertToBase64String(Stream stream)
         {