diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 083a7cd9c7..2b940133e9 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -47,6 +47,11 @@ export default class AppPermission extends React.Component {
     }
 
     render() {
+        let e2eWarningText;
+        if (this.props.isRoomEncrypted) {
+            e2eWarningText =
+                <span className='mx_AppPermissionWarningTextLabel'>NOTE: Apps are not end-to-end encrypted</span>;
+        }
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarningImage'>
@@ -54,6 +59,7 @@ export default class AppPermission extends React.Component {
                 </div>
                 <div className='mx_AppPermissionWarningText'>
                     <span className='mx_AppPermissionWarningTextLabel'>Do you want to load widget from URL:</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curlBase}</span>
+                    {e2eWarningText}
                 </div>
                 <input
                     className='mx_AppPermissionButton'
@@ -67,9 +73,11 @@ export default class AppPermission extends React.Component {
 }
 
 AppPermission.propTypes = {
+    isRoomEncrypted: PropTypes.bool,
     url: PropTypes.string.isRequired,
     onPermissionGranted: PropTypes.func.isRequired,
 };
 AppPermission.defaultProps = {
+    isRoomEncrypted: false,
     onPermissionGranted: function() {},
 };
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a411e1d6f6..0dd051ba33 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -251,9 +251,11 @@ export default React.createClass({
                 );
             }
         } else {
+            const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
                 <div className="mx_AppTileBody">
                     <AppPermission
+                        isRoomEncrypted={isRoomEncrypted}
                         url={this.state.widgetUrl}
                         onPermissionGranted={this._grantWidgetPermission}
                     />