diff --git a/ios/app/watchos/extension/ExtensionDelegate.swift b/ios/app/watchos/extension/ExtensionDelegate.swift
index 9a97c8d64..100661c47 100644
--- a/ios/app/watchos/extension/ExtensionDelegate.swift
+++ b/ios/app/watchos/extension/ExtensionDelegate.swift
@@ -80,11 +80,27 @@ class ExtensionDelegate: NSObject, WCSessionDelegate, WKExtensionDelegate {
       let micMuted = applicationContext["micMuted"] as? NSNumber ?? -1;
       print("MIC MUTED \(micMuted)");
 
+      // Update recent URLs
       let recentURLs = applicationContext["recentURLs"];
       if let recentURLsArray = recentURLs as? NSArray {
         let controller = WKExtension.shared().rootInterfaceController as! InterfaceController
         controller.updateRecents(withRecents: recentURLsArray)
       }
+
+      // If the current controller is not the in-call controller and we have a
+      // conference URL, show the in-call controller
+      if let currentController = WKExtension.shared().visibleInterfaceController as? InterfaceController {
+          if conferenceURL != "NULL" {
+              let room = conferenceURL.components(separatedBy: "/").last
+              let context = ["room" : room, "roomUrl" : conferenceURL as String!, "skipJoin" : "yes"]
+              currentController.pushController(withName: "InCallController", context: context)
+          }
+      } else {
+          // This must be InCallController
+          if conferenceURL == "NULL" {
+              WKExtension.shared().visibleInterfaceController?.popToRootController()
+          }
+      }
     }
 
 }
diff --git a/ios/app/watchos/extension/InCallController.swift b/ios/app/watchos/extension/InCallController.swift
index 8065e741f..3ac59eec8 100644
--- a/ios/app/watchos/extension/InCallController.swift
+++ b/ios/app/watchos/extension/InCallController.swift
@@ -43,8 +43,11 @@ class InCallController: WKInterfaceController {
       super.awake(withContext: context)
         
       if let data = context as? [String : String] {
-        sendMessage(["command": "joinConference", "data" : data["roomUrl"]!])
-        roomLabel.setText(data["room"]!)
+          if data["skipJoin"] != "yes" {
+              sendMessage(["command": "joinConference", "data" : data["roomUrl"]!])
+          }
+
+          roomLabel.setText(data["room"]!)
       }
   }