diff --git a/bean-query-daemon-lib.pl b/bean-query-daemon-lib.pl
index 089f163..dd90e49 100644
--- a/bean-query-daemon-lib.pl
+++ b/bean-query-daemon-lib.pl
@@ -32,12 +32,7 @@ sub BeancountQuerySubmit($;$) {
   my $cnt = 0;
   while (not defined $BEANCOUNT_QUERY{fifoName}) {
     sleep 1;
-    if ($cnt++ >= (5 * 60)) {
-      (tied %BEANCOUNT_QUERY)->shlock;
-      $BEANCOUNT_QUERY{question} = $BEANCOUNT_QUERY{format} = undef;
-      (tied %BEANCOUNT_QUERY)->shunlock;
-      die "Unable to initiate query to beancount server\n";
-    }
+    die "Unable to initiate query to beancount server\n" if ($cnt++ >= (5 * 60));
   }
   unless (-p $BEANCOUNT_QUERY{fifoName}) {
     (tied %BEANCOUNT_QUERY)->shlock;