diff --git a/packages/rivetkit/src/client/config.ts b/packages/rivetkit/src/client/config.ts
index 8369152c8..379ba4e5a 100644
--- a/packages/rivetkit/src/client/config.ts
+++ b/packages/rivetkit/src/client/config.ts
@@ -25,7 +25,12 @@ export const ClientConfigSchema = z.object({
 	endpoint: z
 		.string()
 		.nullable()
-		.default(() => getEnvUniversal("RIVET_ENGINE") ?? null),
+		.default(
+			() =>
+				getEnvUniversal("RIVET_ENGINE") ??
+				getEnvUniversal("RIVET_ENDPOINT") ??
+				null,
+		),
 
 	namespace: z
 		.string()
diff --git a/packages/rivetkit/src/drivers/engine/config.ts b/packages/rivetkit/src/drivers/engine/config.ts
index 966c40fbe..824978f90 100644
--- a/packages/rivetkit/src/drivers/engine/config.ts
+++ b/packages/rivetkit/src/drivers/engine/config.ts
@@ -8,7 +8,10 @@ export const ConfigSchema = z
 		endpoint: z
 			.string()
 			.default(
-				() => getEnvUniversal("RIVET_ENGINE") ?? "http://localhost:6420",
+				() =>
+					getEnvUniversal("RIVET_ENGINE") ??
+					getEnvUniversal("RIVET_ENDPOINT") ??
+					"http://localhost:6420",
 			),
 		token: z
 			.string()