diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index bc28456f..9f8d2cae 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -39,6 +39,7 @@ Rectangle {
 		anchors.fill: stateImg
 		source: stateImg
 		color: colors.buttonText
+		visible: stateImg.source != ""
 	}
 }
 
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 5a5a2162..2385c750 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -102,7 +102,6 @@ Rectangle {
 					id: media
 					onError: console.log(errorString)
 					onStatusChanged: if(status == MediaPlayer.Loaded) progress.updatePositionTexts()
-					autoPlay: true
 				}
 
 				Connections {