diff --git a/app/client/jsx/Room.jsx b/app/client/jsx/Room.jsx
index 21ac2fb70..79b1d298c 100644
--- a/app/client/jsx/Room.jsx
+++ b/app/client/jsx/Room.jsx
@@ -211,8 +211,7 @@ class Room extends Component {
                 <Navigation
                     directions={room.directions}
                     onClick={this.onSwitchRoom.bind(this)}
-                    // showMapButton={isMapUnlocked}
-                    showMapButton={true}
+                    showMapButton={isMapUnlocked}
                     showMapTooltip={showMapTooltip}
                     handleOpenMap={this.handleOpenMap.bind(this)}></Navigation>
                 <Beforeunload onBeforeunload={this.handleBeforeUnload.bind(this)} />
diff --git a/app/client/styles/themes/_default.scss b/app/client/styles/themes/_default.scss
index 05223739a..88f31474a 100755
--- a/app/client/styles/themes/_default.scss
+++ b/app/client/styles/themes/_default.scss
@@ -16,4 +16,4 @@ body {
 }
 .ReactModal__Overlay {
 	background: lighten($background-color, 20%) !important;
-}
\ No newline at end of file
+}
diff --git a/app/jitsi/__init__.py b/app/jitsi/__init__.py
index 85996e41b..23b3dc26d 100644
--- a/app/jitsi/__init__.py
+++ b/app/jitsi/__init__.py
@@ -8,8 +8,7 @@
 staticdir = os.path.join(basedir, 'client/js')
 
 db = SQLAlchemy()
-# socketio = SocketIO(async_mode="eventlet")
-socketio = SocketIO()
+socketio = SocketIO(async_mode="eventlet")
 
 # Register socket events with SocketIO instance
 from . import events