diff --git a/sdk/communication/communication-sms/package.json b/sdk/communication/communication-sms/package.json
index 28295984f8ae..a1b94669704c 100644
--- a/sdk/communication/communication-sms/package.json
+++ b/sdk/communication/communication-sms/package.json
@@ -15,7 +15,7 @@
     "build:autorest": "autorest ./swagger/README.md --typescript --v3 --package-version=1.0.1 && rushx format",
     "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
     "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
-    "build:samples": "echo Obsolete.",
+    "build:samples": "dev-tool samples publish --force",
     "build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
     "build": "tsc -p . && rollup -c 2>&1 && api-extractor run --local",
     "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
diff --git a/sdk/communication/communication-sms/samples-dev/usingAadAuth.ts b/sdk/communication/communication-sms/samples-dev/usingAadAuth.ts
index e004975370d0..539da5d18809 100644
--- a/sdk/communication/communication-sms/samples-dev/usingAadAuth.ts
+++ b/sdk/communication/communication-sms/samples-dev/usingAadAuth.ts
@@ -19,7 +19,6 @@ export async function main() {
 
   // You will need to set this environment variable or edit the following values
   const endpoint =
-    process.env.COMMUNICATION_ENDPOINT ||
     parseConnectionString(process.env.COMMUNICATION_SAMPLES_CONNECTION_STRING!).endpoint ||
     "https://<resource-name>.communication.azure.com";
 
diff --git a/sdk/communication/communication-sms/samples/v1/javascript/usingAadAuth.js b/sdk/communication/communication-sms/samples/v1/javascript/usingAadAuth.js
index 554d11c05712..0b0b5db64e73 100644
--- a/sdk/communication/communication-sms/samples/v1/javascript/usingAadAuth.js
+++ b/sdk/communication/communication-sms/samples/v1/javascript/usingAadAuth.js
@@ -19,7 +19,6 @@ async function main() {
 
   // You will need to set this environment variable or edit the following values
   const endpoint =
-    process.env.COMMUNICATION_ENDPOINT ||
     parseConnectionString(process.env.COMMUNICATION_SAMPLES_CONNECTION_STRING).endpoint ||
     "https://<resource-name>.communication.azure.com";
 
diff --git a/sdk/communication/communication-sms/samples/v1/typescript/src/usingAadAuth.ts b/sdk/communication/communication-sms/samples/v1/typescript/src/usingAadAuth.ts
index e004975370d0..539da5d18809 100644
--- a/sdk/communication/communication-sms/samples/v1/typescript/src/usingAadAuth.ts
+++ b/sdk/communication/communication-sms/samples/v1/typescript/src/usingAadAuth.ts
@@ -19,7 +19,6 @@ export async function main() {
 
   // You will need to set this environment variable or edit the following values
   const endpoint =
-    process.env.COMMUNICATION_ENDPOINT ||
     parseConnectionString(process.env.COMMUNICATION_SAMPLES_CONNECTION_STRING!).endpoint ||
     "https://<resource-name>.communication.azure.com";