diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index db62930be2..788940fe0e 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -298,13 +298,13 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_EventTile_e2eIcon.hidden {
+.mx_EventTile_e2eIcon_hidden {
     display: none;
 }
 
 /* always override hidden attribute for blocked and warning */
-.mx_EventTile_e2eIcon.hidden[src="img/e2e-blocked.svg"],
-.mx_EventTile_e2eIcon.hidden[src="img/e2e-warning.svg"] {
+.mx_EventTile_e2eIcon_hidden[src="img/e2e-blocked.svg"],
+.mx_EventTile_e2eIcon_hidden[src="img/e2e-warning.svg"] {
     display: block;
 }
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 0c85b27162..84acfb160e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -31,6 +31,7 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 const ContextualMenu = require('../../structures/ContextualMenu');
 import dis from '../../../dispatcher';
 import {makeEventPermalink} from "../../../matrix-to";
+import SettingsStore from "../../../settings/SettingsStore";
 
 const ObjectUtils = require('../../../ObjectUtils');
 
@@ -745,7 +746,7 @@ function E2ePadlock(props) {
     if (SettingsStore.getValue("alwaysShowEncryptionIcons")) {
         return <img className="mx_EventTile_e2eIcon" {...props} />;
     } else {
-        return <img className="mx_EventTile_e2eIcon hidden" {...props} />;
+        return <img className="mx_EventTile_e2eIcon mx_EventTile_e2eIcon_hidden" {...props} />;
     }
 }