diff --git a/quickshell/Modules/Greetd/GreetdMemory.qml b/quickshell/Modules/Greetd/GreetdMemory.qml
index c263fc56..48006761 100644
--- a/quickshell/Modules/Greetd/GreetdMemory.qml
+++ b/quickshell/Modules/Greetd/GreetdMemory.qml
@@ -14,6 +14,7 @@ Singleton {
 
     property string lastSessionId: ""
     property string lastSuccessfulUser: ""
+    property bool memoryReady: false
     property bool isLightMode: false
     property bool nightModeEnabled: false
 
@@ -75,11 +76,18 @@ Singleton {
     FileView {
         id: memoryFileView
         path: root.memoryFile
-        blockLoading: true
+        blockLoading: false
         blockWrites: false
         atomicWrites: true
         watchChanges: false
         printErrors: false
+        onLoaded: {
+            parseMemory(memoryFileView.text());
+            root.memoryReady = true;
+        }
+        onLoadFailed: {
+            root.memoryReady = true;
+        }
     }
 
     FileView {
diff --git a/quickshell/Modules/Greetd/GreeterContent.qml b/quickshell/Modules/Greetd/GreeterContent.qml
index e4933086..7cfc349b 100644
--- a/quickshell/Modules/Greetd/GreeterContent.qml
+++ b/quickshell/Modules/Greetd/GreeterContent.qml
@@ -132,7 +132,7 @@ Item {
         function onLastSuccessfulUserChanged() {
             applyLastSuccessfulUser();
         }
-        function onLastSessionIdChanged() {
+        function onMemoryReadyChanged() {
             finalizeSessionSelection();
         }
     }
@@ -1030,6 +1030,8 @@ Item {
     function finalizeSessionSelection() {
         if (GreeterState.sessionList.length === 0)
             return;
+        if (!GreetdMemory.memoryReady)
+            return;
 
         const savedSession = GreetdMemory.lastSessionId;
         if (savedSession) {
diff --git a/quickshell/Services/CavaService.qml b/quickshell/Services/CavaService.qml
index d48a9e0a..d3e5717a 100644
--- a/quickshell/Services/CavaService.qml
+++ b/quickshell/Services/CavaService.qml
@@ -18,7 +18,7 @@ Singleton {
         command: ["which", "cava"]
         running: false
         onExited: exitCode => {
-            root.cavaAvailable = exitCode === 0;
+            root.cavaAvailable = exitCode === 0 && Quickshell.env("DMS_DISABLE_CAVA") !== "1";
         }
     }
 
@@ -39,10 +39,6 @@ sensitivity=30
 lower_cutoff_freq=50
 higher_cutoff_freq=12000
 
-[input]
-method=pipewire
-source=auto
-
 [output]
 method=raw
 raw_target=/dev/stdout