diff --git a/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar b/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar
index 065c348b..9d89480f 100644
Binary files a/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar and b/classes/jicofo/jicofo-1.1-SNAPSHOT-jar-with-dependencies.jar differ
diff --git a/classes/jicofo/jicofo-1.1-SNAPSHOT.jar b/classes/jicofo/jicofo-1.1-SNAPSHOT.jar
index 3998e9d7..d598d83d 100644
Binary files a/classes/jicofo/jicofo-1.1-SNAPSHOT.jar and b/classes/jicofo/jicofo-1.1-SNAPSHOT.jar differ
diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
index 135b67f5..db3a02bc 100644
--- a/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
+++ b/src/java/org/jivesoftware/openfire/plugin/ofmeet/OfMeetPlugin.java
@@ -203,7 +203,7 @@ public void initializePlugin(final PluginManager manager, final File pluginDirec
             jitsiJicofoWrapper.initialize(pluginDirectory);
             loadBranding();	
 
-            if ( JiveGlobals.getBooleanProperty( "ofmeet.use.internal.focus.component", false ) )
+            if ( JiveGlobals.getBooleanProperty( "ofmeet.use.internal.focus.component", true ) )
             {
 				focusComponent = new FocusComponent();
 				componentManager = ComponentManagerFactory.getComponentManager();			
diff --git a/src/webapp/libs/lib-jitsi-meet.min.js b/src/webapp/libs/lib-jitsi-meet.min.js
index 83bd3abe..dce061c6 100644
--- a/src/webapp/libs/lib-jitsi-meet.min.js
+++ b/src/webapp/libs/lib-jitsi-meet.min.js
@@ -13944,8 +13944,8 @@
                 join(e) {
                     return this.password = e, new Promise(e => {
                         this.options.disableFocus && _.info("Conference focus disabled for " + this.roomjid);
-                        (this.options.disableFocus ? Promise.resolve() : this.moderator.allocateConferenceFocus()).then(() => {
-                            this.sendPresence(!0), this._removeConnListeners.push(this.connection.addEventListener(f.a.Events.CONN_STATUS_CHANGED, this.onConnStatusChanged.bind(this))), e()
+                        (this.options.disableFocus ? Promise.resolve() : this.sendPresence(!0), this.moderator.allocateConferenceFocus()).then(() => { // BAO
+                            this._removeConnListeners.push(this.connection.addEventListener(f.a.Events.CONN_STATUS_CHANGED, this.onConnStatusChanged.bind(this))), e()
                         })
                     })
                 }