diff --git a/src/cards/ha-camera-card.js b/src/cards/ha-camera-card.js
index 6970be4a51..48ae0f0766 100644
--- a/src/cards/ha-camera-card.js
+++ b/src/cards/ha-camera-card.js
@@ -51,8 +51,9 @@ export default new Polymer({
   },
 
   updateCameraFeedSrc(stateObj) {
+    const attr = stateObj.attributes;
     const time = (new Date()).getTime();
-    this.cameraFeedSrc = `${stateObj.attributes.entity_picture}?time=${time}`;
+    this.cameraFeedSrc = `${attr.entity_picture}?token=${attr.access_token}&time=${time}`;
   },
 
   imageLoadSuccess() {
diff --git a/src/more-infos/more-info-camera.js b/src/more-infos/more-info-camera.js
index 687dee36bc..965d04003a 100644
--- a/src/more-infos/more-info-camera.js
+++ b/src/more-infos/more-info-camera.js
@@ -17,7 +17,8 @@ export default new Polymer({
     if (__DEMO__) {
       return '/demo/webcam.jpg';
     } else if (stateObj) {
-      return `/api/camera_proxy_stream/${this.stateObj.entityId}`;
+      return `/api/camera_proxy_stream/${stateObj.entityId}` +
+             `?token=${stateObj.attributes.access_token}`;
     }
     // Return an empty image if no stateObj (= dialog not open)
     return 'data:image/gif;base64,R0lGODlhAQABAAAAACw=';