diff --git a/.fern/metadata.json b/.fern/metadata.json
index 4d20afc..60ab4af 100644
--- a/.fern/metadata.json
+++ b/.fern/metadata.json
@@ -10,7 +10,7 @@
     ],
     "retry-status-codes": "legacy"
   },
-  "originGitCommit": "4ec89179f0cd7c09cc536f40a9c42a089d9cd425",
+  "originGitCommit": "55f4ed66327cc60c86a1edef9596d71673752c85",
   "originGitCommitIsDirty": false,
   "invokedBy": "ci",
   "ciProvider": "github",
diff --git a/.fern/replay.lock b/.fern/replay.lock
index 60be37c..94e641f 100644
--- a/.fern/replay.lock
+++ b/.fern/replay.lock
@@ -18,5 +18,11 @@ generations:
     cli_version: unknown
     generator_versions:
       fernapi/fern-java-sdk: 4.8.4
-current_generation: e296916f2e3ace45c8c47dc725cbb525c94a22b7
+  - commit_sha: 0ed78dd1a3c4a70635cb29def9f461322f6937bc
+    tree_hash: 68b8f9f37298586f572e3a7ce732e8c6f9e48b72
+    timestamp: 2026-09-03T18:10:23.697Z
+    cli_version: unknown
+    generator_versions:
+      fernapi/fern-java-sdk: 4.8.4
+current_generation: 0ed78dd1a3c4a70635cb29def9f461322f6937bc
 patches: []
diff --git a/src/main/java/com/pipedream/api/resources/oauthapps/requests/CreateOauthAppOpts.java b/src/main/java/com/pipedream/api/resources/oauthapps/requests/CreateOauthAppOpts.java
index a828022..0a8b55f 100644
--- a/src/main/java/com/pipedream/api/resources/oauthapps/requests/CreateOauthAppOpts.java
+++ b/src/main/java/com/pipedream/api/resources/oauthapps/requests/CreateOauthAppOpts.java
@@ -24,9 +24,9 @@
 public final class CreateOauthAppOpts {
     private final String app;
 
-    private final String clientId;
+    private final Optional<String> clientId;
 
-    private final String clientSecret;
+    private final Optional<String> clientSecret;
 
     private final Optional<String> name;
 
@@ -40,8 +40,8 @@ public final class CreateOauthAppOpts {
 
     private CreateOauthAppOpts(
             String app,
-            String clientId,
-            String clientSecret,
+            Optional<String> clientId,
+            Optional<String> clientSecret,
             Optional<String> name,
             Optional<String> description,
             Optional<List<String>> scopes,
@@ -66,18 +66,18 @@ public String getApp() {
     }
 
     /**
-     * @return The OAuth client ID registered with the upstream provider
+     * @return The OAuth client ID registered with the upstream provider. Optional: providers that only issue credentials once they have a callback URL can be registered without one, and the client cannot connect accounts until it is set.
      */
     @JsonProperty("client_id")
-    public String getClientId() {
+    public Optional<String> getClientId() {
         return clientId;
     }
 
     /**
-     * @return The OAuth client secret. Write-only; never returned in responses.
+     * @return The OAuth client secret. Optional, like the client ID. Write-only; never returned in responses.
      */
     @JsonProperty("client_secret")
-    public String getClientSecret() {
+    public Optional<String> getClientSecret() {
         return clientSecret;
     }
 
@@ -159,25 +159,11 @@ public interface AppStage {
         /**
          * <p>The app's ID or name slug. The app must have custom OAuth clients enabled.</p>
          */
-        ClientIdStage app(@NotNull String app);
+        _FinalStage app(@NotNull String app);
 
         Builder from(CreateOauthAppOpts other);
     }
 
-    public interface ClientIdStage {
-        /**
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         */
-        ClientSecretStage clientId(@NotNull String clientId);
-    }
-
-    public interface ClientSecretStage {
-        /**
-         * <p>The OAuth client secret. Write-only; never returned in responses.</p>
-         */
-        _FinalStage clientSecret(@NotNull String clientSecret);
-    }
-
     public interface _FinalStage {
         CreateOauthAppOpts build();
 
@@ -185,6 +171,20 @@ public interface _FinalStage {
 
         _FinalStage additionalProperties(Map<String, Object> additionalProperties);
 
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Optional: providers that only issue credentials once they have a callback URL can be registered without one, and the client cannot connect accounts until it is set.</p>
+         */
+        _FinalStage clientId(Optional<String> clientId);
+
+        _FinalStage clientId(String clientId);
+
+        /**
+         * <p>The OAuth client secret. Optional, like the client ID. Write-only; never returned in responses.</p>
+         */
+        _FinalStage clientSecret(Optional<String> clientSecret);
+
+        _FinalStage clientSecret(String clientSecret);
+
         /**
          * <p>Display name of the OAuth client</p>
          */
@@ -215,13 +215,9 @@ public interface _FinalStage {
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements AppStage, ClientIdStage, ClientSecretStage, _FinalStage {
+    public static final class Builder implements AppStage, _FinalStage {
         private String app;
 
-        private String clientId;
-
-        private String clientSecret;
-
         private Optional<List<String>> additionalScopes = Optional.empty();
 
         private Optional<List<String>> scopes = Optional.empty();
@@ -230,6 +226,10 @@ public static final class Builder implements AppStage, ClientIdStage, ClientSecr
 
         private Optional<String> name = Optional.empty();
 
+        private Optional<String> clientSecret = Optional.empty();
+
+        private Optional<String> clientId = Optional.empty();
+
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
@@ -254,35 +254,11 @@ public Builder from(CreateOauthAppOpts other) {
          */
         @java.lang.Override
         @JsonSetter("app")
-        public ClientIdStage app(@NotNull String app) {
+        public _FinalStage app(@NotNull String app) {
             this.app = Objects.requireNonNull(app, "app must not be null");
             return this;
         }
 
-        /**
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("client_id")
-        public ClientSecretStage clientId(@NotNull String clientId) {
-            this.clientId = Objects.requireNonNull(clientId, "clientId must not be null");
-            return this;
-        }
-
-        /**
-         * <p>The OAuth client secret. Write-only; never returned in responses.</p>
-         * <p>The OAuth client secret. Write-only; never returned in responses.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("client_secret")
-        public _FinalStage clientSecret(@NotNull String clientSecret) {
-            this.clientSecret = Objects.requireNonNull(clientSecret, "clientSecret must not be null");
-            return this;
-        }
-
         /**
          * <p>Extra OAuth scopes users may grant on top of the base scopes</p>
          * @return Reference to {@code this} so that method calls can be chained together.
@@ -363,6 +339,46 @@ public _FinalStage name(Optional<String> name) {
             return this;
         }
 
+        /**
+         * <p>The OAuth client secret. Optional, like the client ID. Write-only; never returned in responses.</p>
+         * @return Reference to {@code this} so that method calls can be chained together.
+         */
+        @java.lang.Override
+        public _FinalStage clientSecret(String clientSecret) {
+            this.clientSecret = Optional.ofNullable(clientSecret);
+            return this;
+        }
+
+        /**
+         * <p>The OAuth client secret. Optional, like the client ID. Write-only; never returned in responses.</p>
+         */
+        @java.lang.Override
+        @JsonSetter(value = "client_secret", nulls = Nulls.SKIP)
+        public _FinalStage clientSecret(Optional<String> clientSecret) {
+            this.clientSecret = clientSecret;
+            return this;
+        }
+
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Optional: providers that only issue credentials once they have a callback URL can be registered without one, and the client cannot connect accounts until it is set.</p>
+         * @return Reference to {@code this} so that method calls can be chained together.
+         */
+        @java.lang.Override
+        public _FinalStage clientId(String clientId) {
+            this.clientId = Optional.ofNullable(clientId);
+            return this;
+        }
+
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Optional: providers that only issue credentials once they have a callback URL can be registered without one, and the client cannot connect accounts until it is set.</p>
+         */
+        @java.lang.Override
+        @JsonSetter(value = "client_id", nulls = Nulls.SKIP)
+        public _FinalStage clientId(Optional<String> clientId) {
+            this.clientId = clientId;
+            return this;
+        }
+
         @java.lang.Override
         public CreateOauthAppOpts build() {
             return new CreateOauthAppOpts(
diff --git a/src/main/java/com/pipedream/api/resources/oauthapps/requests/UpdateOauthAppOpts.java b/src/main/java/com/pipedream/api/resources/oauthapps/requests/UpdateOauthAppOpts.java
index 0585513..73ff2c1 100644
--- a/src/main/java/com/pipedream/api/resources/oauthapps/requests/UpdateOauthAppOpts.java
+++ b/src/main/java/com/pipedream/api/resources/oauthapps/requests/UpdateOauthAppOpts.java
@@ -69,7 +69,7 @@ public Optional<String> getDescription() {
     }
 
     /**
-     * @return The OAuth client ID registered with the upstream provider
+     * @return The OAuth client ID registered with the upstream provider. Blank values are ignored and the existing client ID is kept.
      */
     @JsonProperty("client_id")
     public Optional<String> getClientId() {
@@ -193,7 +193,7 @@ public Builder description(String description) {
         }
 
         /**
-         * <p>The OAuth client ID registered with the upstream provider</p>
+         * <p>The OAuth client ID registered with the upstream provider. Blank values are ignored and the existing client ID is kept.</p>
          */
         @JsonSetter(value = "client_id", nulls = Nulls.SKIP)
         public Builder clientId(Optional<String> clientId) {
diff --git a/src/main/java/com/pipedream/api/types/OauthApp.java b/src/main/java/com/pipedream/api/types/OauthApp.java
index e361ec8..02678f5 100644
--- a/src/main/java/com/pipedream/api/types/OauthApp.java
+++ b/src/main/java/com/pipedream/api/types/OauthApp.java
@@ -26,7 +26,7 @@
 public final class OauthApp {
     private final Optional<String> id;
 
-    private final String clientId;
+    private final Optional<String> clientId;
 
     private final Optional<List<String>> scopes;
 
@@ -62,7 +62,7 @@ public final class OauthApp {
 
     private OauthApp(
             Optional<String> id,
-            String clientId,
+            Optional<String> clientId,
             Optional<List<String>> scopes,
             Optional<List<String>> additionalScopes,
             Optional<String> redirectUri,
@@ -108,10 +108,10 @@ public Optional<String> getId() {
     }
 
     /**
-     * @return The OAuth client ID registered with the upstream provider
+     * @return The OAuth client ID registered with the upstream provider. Null for a client registered before its provider issued credentials.
      */
     @JsonProperty("client_id")
-    public String getClientId() {
+    public Optional<String> getClientId() {
         return clientId;
     }
 
@@ -284,24 +284,17 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static ClientIdStage builder() {
+    public static OwnerIdStage builder() {
         return new Builder();
     }
 
-    public interface ClientIdStage {
-        /**
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         */
-        OwnerIdStage clientId(@NotNull String clientId);
-
-        Builder from(OauthApp other);
-    }
-
     public interface OwnerIdStage {
         /**
          * <p>Hash ID of the owner: the workspace (o_...) or the project (proj_...)</p>
          */
         NameSlugStage ownerId(@NotNull String ownerId);
+
+        Builder from(OauthApp other);
     }
 
     public interface NameSlugStage {
@@ -346,6 +339,13 @@ public interface _FinalStage {
 
         _FinalStage id(String id);
 
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Null for a client registered before its provider issued credentials.</p>
+         */
+        _FinalStage clientId(Optional<String> clientId);
+
+        _FinalStage clientId(String clientId);
+
         /**
          * <p>OAuth scopes requested when users connect through this client</p>
          */
@@ -414,15 +414,7 @@ public interface _FinalStage {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Builder
-            implements ClientIdStage,
-                    OwnerIdStage,
-                    NameSlugStage,
-                    NameStage,
-                    ImgSrcStage,
-                    FeaturedWeightStage,
-                    _FinalStage {
-        private String clientId;
-
+            implements OwnerIdStage, NameSlugStage, NameStage, ImgSrcStage, FeaturedWeightStage, _FinalStage {
         private String ownerId;
 
         private String nameSlug;
@@ -453,6 +445,8 @@ public static final class Builder
 
         private Optional<List<String>> scopes = Optional.empty();
 
+        private Optional<String> clientId = Optional.empty();
+
         private Optional<String> id = Optional.empty();
 
         @JsonAnySetter
@@ -482,18 +476,6 @@ public Builder from(OauthApp other) {
             return this;
         }
 
-        /**
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         * <p>The OAuth client ID registered with the upstream provider</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("client_id")
-        public OwnerIdStage clientId(@NotNull String clientId) {
-            this.clientId = Objects.requireNonNull(clientId, "clientId must not be null");
-            return this;
-        }
-
         /**
          * <p>Hash ID of the owner: the workspace (o_...) or the project (proj_...)</p>
          * <p>Hash ID of the owner: the workspace (o_...) or the project (proj_...)</p>
@@ -763,6 +745,26 @@ public _FinalStage scopes(Optional<List<String>> scopes) {
             return this;
         }
 
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Null for a client registered before its provider issued credentials.</p>
+         * @return Reference to {@code this} so that method calls can be chained together.
+         */
+        @java.lang.Override
+        public _FinalStage clientId(String clientId) {
+            this.clientId = Optional.ofNullable(clientId);
+            return this;
+        }
+
+        /**
+         * <p>The OAuth client ID registered with the upstream provider. Null for a client registered before its provider issued credentials.</p>
+         */
+        @java.lang.Override
+        @JsonSetter(value = "client_id", nulls = Nulls.SKIP)
+        public _FinalStage clientId(Optional<String> clientId) {
+            this.clientId = clientId;
+            return this;
+        }
+
         /**
          * <p>Hash ID for the OAuth client</p>
          * @return Reference to {@code this} so that method calls can be chained together.