diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9718ef0ef6..fb3c95fdcd 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -738,9 +738,6 @@ module.exports = React.createClass({
 
     onDeviceVerificationChanged: function(userId, device) {
         const room = this.state.room;
-        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
-            return;
-        }
         if (!room.currentState.getMember(userId)) {
             return;
         }
@@ -748,6 +745,9 @@ module.exports = React.createClass({
     },
 
     _updateE2EStatus: function(room) {
+        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
+            return;
+        }
         room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
             this.setState({e2eStatus: hasUnverifiedDevices ? "warning" : "verified"});
         });