diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index df7a69671fb346f4f29c470127b6a9080ae862a9..6ade68cf62b70af4269a5b078d9fcc2e978432d3 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1735,6 +1735,17 @@ if [ -n "$HOST" ]; then
 	echo "Assigning $HOST for servername in /etc/nginx/sites-available/bigbluebutton"
 	sudo sed -i "s/server_name  .*/server_name  $HOST;/g" /etc/nginx/sites-available/bigbluebutton
 
+        #
+        # Update configuration for BigBlueButton client (and perserve hostname for chromeExtensionLink if exists)
+        #
+
+        echo "Assigning $HOST for http[s]:// in /var/www/bigbluebutton/client/conf/config.xml"
+        chromeExtensionLinkURL=$(cat /var/www/bigbluebutton/client/conf/config.xml | sed -n '/chromeExtensionLink/{s/.*https*:\/\///;s/\/.*//;p}')
+        sudo sed -i "s/http[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/$PROTOCOL_HTTP:\/\/$HOST\2/g"  \
+		/var/www/bigbluebutton/client/conf/config.xml
+        sudo sed -i "s/chromeExtensionLink=\"https:\/\/[^\/]*/chromeExtensionLink=\"https:\/\/$chromeExtensionLinkURL/g" \ 
+		/var/www/bigbluebutton/client/conf/config.xml
+
 	#
 	# Update configuration for BigBlueButton client
 	#