diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 7cb2e9cb..3c61344c 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -673,7 +673,9 @@ editor=/home/fic/.config/aerc/helix-config/hx.sh
 # ignored.
 #
 # This parameter can also be set per account in accounts.conf.
-address-book-cmd=emailbook /home/fic/mail/emailbook.txt --search "%s"
+# address-book-cmd=emailbook /home/fic/mail/emailbook.txt --search "%s"
+# address-book-cmd='notmuch address "*" | grep -i "%s"'
+address-book-cmd='notmuch address "%s"'
 
 # Specifies the command to be used to select attachments. Any occurrence of
 # '%s' in the file-picker-cmd will be replaced with the argument <arg>
@@ -831,7 +833,7 @@ aerc-startup=/home/fic/.config/mail/mail-sync.sh &
 #
 # Executed when aerc shuts down.
 #aerc-shutdown=
-aerc-shutdown=/home/fic/.config/mail/mail-sync.sh &
+# aerc-shutdown=/home/fic/.config/mail/mail-sync.sh &
 
 #
 # Executed when notmuch tags are modified.