diff --git a/.autover/changes/6c77f6f7-8750-4b71-a4bd-8976d6b5fc1e.json b/.autover/changes/6c77f6f7-8750-4b71-a4bd-8976d6b5fc1e.json
new file mode 100644
index 000000000..621c6778d
--- /dev/null
+++ b/.autover/changes/6c77f6f7-8750-4b71-a4bd-8976d6b5fc1e.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.TestTool",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Fix issue with long debugging sessions causing events to be retried"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaClient.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaClient.cs
index 59eafc6ed..9ad837f59 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaClient.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaClient.cs
@@ -34,7 +34,13 @@ private IAmazonLambda CreateClient(string endpoint)
     {
         var config = new AmazonLambdaConfig
         {
-            ServiceURL = endpoint
+            ServiceURL = endpoint,
+
+            // Turn of retries since the calls we are making are locally and we don't want retry happening while waiting for debugging.
+            MaxErrorRetry = 0,
+
+            // Set to infinite to allow debugging without timeouts causing retrigger of events
+            Timeout = Timeout.InfiniteTimeSpan
         };
         return new AmazonLambdaClient(
             new Amazon.Runtime.BasicAWSCredentials("accessKey", "secretKey"),