diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index be38c448..1446bb11 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -1328,12 +1328,11 @@ I should just switch to Linux at this point :(
   (use-package smtpmail
     :straight t)
 #+end_src
-** Epg
+** Emacs Pinentry
 #+begin_src emacs-lisp
-    (use-package epg
+    (use-package pinentry
       :straight t
-      :config 
-      (setq epg-pinentry-mode 'loopback))
+      :config (pinentry-start))
 #+end_src
 * Org Mode Configuration Setup
 ** Babel Languages
diff --git a/config/emacs/init.el b/config/emacs/init.el
index 9977f195..efba4be2 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -1093,10 +1093,9 @@ kept-old-versions 5)
 (use-package smtpmail
   :straight t)
 
-(use-package epg
+(use-package pinentry
   :straight t
-  :config 
-  (setq epg-pinentry-mode 'loopback))
+  :config (pinentry-start))
 
 (org-babel-do-load-languages
 'org-babel-load-languages
diff --git a/default.nix b/default.nix
index d03cea32..b3c6d4d5 100644
--- a/default.nix
+++ b/default.nix
@@ -119,6 +119,7 @@
     # enableSSHSupport = true;
     settings = {
       allow-loopback-entry = true;
+      allow-emacs-pinentry = true;
     };
   };