diff --git a/src/CallHandler.js b/src/CallHandler.js
index 5fefa7cf1..d6367a6bf 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -50,8 +50,6 @@ limitations under the License.
  *
  * {
  *   action: 'answer'
- *   remote_element: DOMVideoElement, // only if type: video
- *   local_element: DOMVideoElement,  // only if type: video
  *   room_id: <room that the answer button was pressed in>
  * }
  */
diff --git a/src/controllers/molecules/voip/CallView.js b/src/controllers/molecules/voip/CallView.js
index 9546f885f..0a5e3e2f6 100644
--- a/src/controllers/molecules/voip/CallView.js
+++ b/src/controllers/molecules/voip/CallView.js
@@ -48,9 +48,11 @@ module.exports = {
         if (payload.action !== 'call_state') {
             return;
         }
-        this.setState({
-            call: CallHandler.getCall(payload.room_id)
-        });
+        var call = CallHandler.getCall(payload.room_id);
+        if (call) {
+            call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
+            call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
+        }
     }
 };