diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml
index e501d6ab4677ad789d15053c841ac2c79699b52e..3edf0d863ac6ee1deb0006adf66348655bfcaf6d 100644
--- a/resources/qml/PrivacyScreen.qml
+++ b/resources/qml/PrivacyScreen.qml
@@ -12,7 +12,7 @@ import im.nheko 1.0
 Item {
     id: privacyScreen
 
-    readonly property bool active: screenSaver.state === "Visible"
+    readonly property bool active: Settings.privacyScreen && screenSaver.state === "Visible"
     property var timelineRoot
     property int screenTimeout
 
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 509e80a626a700b02cbe0eb9f2dbc4acfce680cd..f28118696ed0de2976e94363dba3b30f5ae5952d 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -28,34 +28,15 @@ AbstractButton {
     height: width*proportionalHeight
     hoverEnabled: true
 
-    state: img.status != Image.Ready ? "ImageLoading" : (timeline.privacyScreen.active ? "PrivacyScreenVisible" : "PrivacyScreenInvisible")
+    state: (img.status != Image.Ready || timeline.privacyScreen.active) ? "BlurhashVisible" : "ImageVisible"
     states: [
         State {
-            name: "ImageLoading"
+            name: "BlurhashVisible"
 
             PropertyChanges {
                 target: blurhash_
-                opacity: 1
-                visible: true
-            }
-
-            PropertyChanges {
-                target: img
-                opacity: 0
-            }
-
-            PropertyChanges {
-                target: mxcimage
-                opacity: 0
-            }
-        },
-        State {
-            name: "PrivacyScreenVisible"
-
-            PropertyChanges {
-                target: blurhash_
-                opacity: blurhash ? 1 : 0
-                visible: blurhash ? true : false
+                opacity: (img.status != Image.Ready) || (timeline.privacyScreen.active && blurhash) ? 1 : 0
+                visible: (img.status != Image.Ready) || (timeline.privacyScreen.active && blurhash)
             }
 
             PropertyChanges {
@@ -69,7 +50,7 @@ AbstractButton {
             }
         },
         State {
-            name: "PrivacyScreenInvisible"
+            name: "ImageVisible"
 
             PropertyChanges {
                 target: blurhash_
@@ -90,8 +71,8 @@ AbstractButton {
     ]
     transitions: [
         Transition {
-            from: "PrivacyScreenInvisible"
-            to: "PrivacyScreenVisible"
+            from: "ImageVisible"
+            to: "BlurhashVisible"
             reversible: true
 
             SequentialAnimation {