diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index e1c0ea65a9..06d660d5b3 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -273,6 +273,8 @@ static void hb_rddCloseAll( void )
       {
          pCurrArea = pAreaNode;
          pAreaNode = pAreaNode->pNext;
+         s_pCurrArea = pCurrArea;
+         s_uiCurrArea = ( ( AREAP ) pCurrArea->pArea )->uiArea;
          if ( isFinish )
          {
             SELF_RELEASE( ( AREAP ) pCurrArea->pArea );