diff --git a/libnymea-app-core/models/logsmodel.h b/libnymea-app-core/models/logsmodel.h
index 3c2c08b9..1d8b26f1 100644
--- a/libnymea-app-core/models/logsmodel.h
+++ b/libnymea-app-core/models/logsmodel.h
@@ -81,7 +81,7 @@ private slots:
     void newLogEntryReceived(const QVariantMap &data);
 
 protected:
-    Engine *m_engine;
+    Engine *m_engine = nullptr;
     QList<LogEntry*> m_list;
     QString m_deviceId;
     QStringList m_typeIds;
diff --git a/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml
index 9b65946c..7b90124c 100644
--- a/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml
+++ b/nymea-app/ui/devicepages/GenericDeviceStateDetailsPage.qml
@@ -75,8 +75,10 @@ Page {
                         MouseArea {
                             anchors.fill: parent
                             anchors.margins: -app.margins / 2
-                            onClicked: pageStack.push(Qt.resolvedUrl("StateLogPage.qml"),
+                            onClicked: {
+                                pageStack.push(Qt.resolvedUrl("StateLogPage.qml"),
                                                       {device: root.device, stateType: stateType})
+                            }
                         }
                     }
 
diff --git a/nymea-app/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml
index e06a7488..924c62f0 100644
--- a/nymea-app/ui/devicepages/StateLogPage.qml
+++ b/nymea-app/ui/devicepages/StateLogPage.qml
@@ -31,7 +31,9 @@ Page {
         engine: _engine
         deviceId: root.device.id
         live: true
-        Component.onCompleted: update()
+        Component.onCompleted: {
+            update()
+        }
         typeIds: [root.stateType.id]
     }