1 files changed, 3 insertions, 0 deletions
diff --git a/src/journal.cc b/src/journal.cc
index 007acd7b..160abe06 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -173,6 +173,9 @@ account_t * journal_t::expand_aliases(string name) {
   // prevent infinite excursion. Each alias may only be expanded at most once.
   account_t * result = NULL;
 
+  if(no_aliases)
+    return result;
+
   bool keep_expanding = true;
   std::list<string> already_seen;
   // loop until no expansion can be found