diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index db0bdfdf15a..b6f328a8449 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -143806,6 +143806,12 @@ paths:
               schema:
                 $ref: "#/components/schemas/APIErrorResponse"
           description: Not Found
+        "409":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/APIErrorResponse"
+          description: Conflict - Another active feature flag already uses the archived flag's key or name.
         "429":
           $ref: "#/components/responses/TooManyRequestsResponse"
       security:
diff --git a/src/main/java/com/datadog/api/client/v2/api/FeatureFlagsApi.java b/src/main/java/com/datadog/api/client/v2/api/FeatureFlagsApi.java
index ad5430c1538..b69283e06dc 100644
--- a/src/main/java/com/datadog/api/client/v2/api/FeatureFlagsApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/FeatureFlagsApi.java
@@ -2866,6 +2866,7 @@ public CompletableFuture<FeatureFlagResponse> unarchiveFeatureFlagAsync(UUID fea
    *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
    *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
    *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 409 </td><td> Conflict - Another active feature flag already uses the archived flag&#39;s key or name. </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
diff --git a/src/test/resources/com/datadog/api/client/v2/api/feature_flags.feature b/src/test/resources/com/datadog/api/client/v2/api/feature_flags.feature
index f44699236d8..67787fc35b0 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/feature_flags.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/feature_flags.feature
@@ -430,6 +430,13 @@ Feature: Feature Flags
     When the request is sent
     Then the response status is 400 Bad Request
 
+  @generated @skip @team:DataDog/feature-flags
+  Scenario: Unarchive a feature flag returns "Conflict - Another active feature flag already uses the archived flag's key or name." response
+    Given new "UnarchiveFeatureFlag" request
+    And request contains "feature_flag_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 409 Conflict - Another active feature flag already uses the archived flag's key or name.
+
   @skip @team:DataDog/feature-flags
   Scenario: Unarchive a feature flag returns "Not Found" response
     Given new "UnarchiveFeatureFlag" request