diff --git a/demos/browser/server.js b/demos/browser/server.js
index bf9f906a2..c11ac97e3 100644
--- a/demos/browser/server.js
+++ b/demos/browser/server.js
@@ -24,13 +24,13 @@ const indexPage = fs.readFileSync(indexPagePath);
 
 const currentRegion = process.env.REGION || 'us-east-1';
 
-const chimeSDKMediaPipelines = new ChimeSDKMediaPipelines({ region: 'us-east-1' });
-chimeSDKMediaPipelines.endpoint = process.env.CHIME_SDK_MEDIA_PIPELINES_ENDPOINT || "https://media-pipelines-chime.us-east-1.amazonaws.com"
+const chimeSDKMediaPipelines = new ChimeSDKMediaPipelines({
+  region: 'us-east-1',
+  endpoint: process.env.CHIME_SDK_MEDIA_PIPELINES_ENDPOINT || "https://media-pipelines-chime.us-east-1.amazonaws.com" });
 
-const chimeSDKMeetings = new ChimeSDKMeetings({ region: currentRegion });
-if (process.env.ENDPOINT) {
-  chimeSDKMeetings.endpoint = process.env.ENDPOINT
-}
+const chimeSDKMeetings = new ChimeSDKMeetings({
+  region: currentRegion,
+  ...(process.env.ENDPOINT && { endpoint: process.env.ENDPOINT }) });
 
 const sts = new STS({ region: 'us-east-1' });
 
diff --git a/demos/serverless/deploy.js b/demos/serverless/deploy.js
index 47b239cd2..41ee6a9fb 100755
--- a/demos/serverless/deploy.js
+++ b/demos/serverless/deploy.js
@@ -11,7 +11,7 @@ let app = `meetingV2`;
 let useEventBridge = false;
 let enableTerminationProtection = false;
 let disablePrintingLogs = false;
-let chimeSDKMeetingsEndpoint = 'https://service.chime.aws.amazon.com';
+let chimeSDKMeetingsEndpoint = 'https://meetings-chime.us-east-1.amazonaws.com';
 let chimeMediaPipelinesServicePrincipal = 'mediapipelines.chime.amazonaws.com'
 let captureOutputPrefix = ''
 let mediaCaptureRegions = [
diff --git a/demos/serverless/src/handlers.js b/demos/serverless/src/handlers.js
index 92408a8fb..30329052c 100644
--- a/demos/serverless/src/handlers.js
+++ b/demos/serverless/src/handlers.js
@@ -25,18 +25,14 @@ const ivs = new Ivs({
   apiVersion: '2020-07-14',
 });
 
-const chimeSDKMeetings = new ChimeSDKMeetings({
-  region: currentRegion,
-});
-if (chimeSDKMeetingsEndpoint) {
-  chimeSDKMeetings.endpoint = chimeSDKMeetingsEndpoint;
-}
+
+const chimeSDKMeetings = new ChimeSDKMeetings({ region: currentRegion, endpoint: chimeSDKMeetingsEndpoint });
 
 // Create an AWS SDK Media Pipelines object.
 const chimeSdkMediaPipelines = new ChimeSDKMediaPipelines({
   region: mediaPipelinesControlRegion,
+  endpoint: chimeSDKMediaPipelinesEndpoint
 });
-chimeSdkMediaPipelines.endpoint = chimeSDKMediaPipelinesEndpoint;
 
 // Read resource names from the environment
 const {