diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index b11832e72..3db4ef7ca 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -3232,7 +3232,8 @@ TEH_keys_get_handler (struct TEH_RequestContext *rc,
     const struct KeysResponseData *krd;
 
     ksh = TEH_keys_get_state ();
-    if (NULL == ksh)
+    if ( (NULL == ksh) ||
+         (0 == ksh->krd_array_length) )
     {
       if ( ( (SKR_LIMIT == skr_size) &&
              (rc->connection == skr_connection) ) ||