diff --git a/mnemo/memo.php b/mnemo/memo.php
index 34f312d734c..e8a49667f10 100644
--- a/mnemo/memo.php
+++ b/mnemo/memo.php
@@ -166,10 +166,6 @@ function showPassphrase($memo)
         $storage = $GLOBALS['injector']->getInstance('Mnemo_Factory_Driver')->create($memolist_original);
         break;
     } else {
-        if (!strlen($memo_passphrase)) {
-            $memo_passphrase = Mnemo::getPassphrase($memo_id);
-        }
-
         /* If $memo_id is set, we're modifying an existing note.  Otherwise,
          * we're adding a new note with the provided attributes. */
         if (!empty($memo_id)) {
@@ -198,8 +194,7 @@ function showPassphrase($memo)
                 }
             }
             $memo_desc = $storage->getMemoDescription($memo_body);
-            if (empty($memo_passphrase) &&
-                Horde_Util::getFormData('memo_encrypt') == 'on') {
+            if (!strlen($memo_passphrase) && Horde_Util::getFormData('memo_encrypt') == 'on') {
                 $memo_passphrase = Mnemo::getPassphrase($memo_id);
             }
             try {