diff --git a/package.json b/package.json
index 4d5e77ef..f518b79c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-toolkit",
   "displayName": "Azure IoT Hub Toolkit",
   "description": "Interact with Azure IoT Hub, IoT Device Management, IoT Edge Management, IoT Hub Device Simulation, IoT Hub Code Generation",
-  "version": "2.7.0-rc2",
+  "version": "2.7.0-rc3",
   "publisher": "vsciot-vscode",
   "aiKey": "0caaff90-cc1c-4def-b64c-3ef33615bc9b",
   "icon": "logo.png",
diff --git a/src/iotHubMessageExplorer.ts b/src/iotHubMessageExplorer.ts
index 6e21c524..d5448a95 100644
--- a/src/iotHubMessageExplorer.ts
+++ b/src/iotHubMessageExplorer.ts
@@ -58,11 +58,9 @@ export class IoTHubMessageExplorer extends IoTHubMessageBaseExplorer {
 
         try {
             this._outputChannel.show();
-            const deviceLabel = deviceItem ? `[${deviceItem.deviceId}]` : "all devices";
+            const deviceLabel = deviceItem ? `device [${deviceItem.deviceId}]` : "all devices";
             this.outputLine(Constants.IoTHubMonitorLabel, `Start monitoring message arrived in built-in endpoint for ${deviceLabel} ...`);
-            if (!this._eventHubClient) {
-                this._eventHubClient = await EventHubClient.createFromIotHubConnectionString(iotHubConnectionString);
-            }
+            this._eventHubClient = await EventHubClient.createFromIotHubConnectionString(iotHubConnectionString);
             TelemetryClient.sendEvent(Constants.IoTHubAIStartMonitorEvent, { deviceType: deviceItem ? deviceItem.contextValue : "" });
             await this.startMonitor(Constants.IoTHubMonitorLabel, consumerGroup, deviceItem);
             this.updateMonitorStatus(true);