diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c
index 08b7aeff3b..eae7cf883e 100644
--- a/harbour/source/rdd/dbf1.c
+++ b/harbour/source/rdd/dbf1.c
@@ -703,7 +703,9 @@ ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo )
    else /* Out of space */
    {
       pArea->ulRecNo = pArea->ulRecCount + 1;
-      pArea->fBof = pArea->fEof = pArea->fValidBuffer = TRUE;
+      /* pArea->fBof = pArea->fEof = pArea->fValidBuffer = TRUE; */
+      pArea->fBof = (pArea->ulRecCount == 0);
+      pArea->fEof = pArea->fValidBuffer = TRUE;
       pArea->fPositioned = pArea->fDeleted = FALSE;
 
       /* Clear buffer */