diff --git a/bacnet-stack/bacfile.c b/bacnet-stack/bacfile.c
index 062fe413..5779a414 100644
--- a/bacnet-stack/bacfile.c
+++ b/bacnet-stack/bacfile.c
@@ -313,6 +313,10 @@ bool bacfile_read_data(BACNET_ATOMIC_READ_FILE_DATA *data)
         SEEK_SET);
       data->fileDataLength = fread(data->fileData, 1,
         data->type.stream.requestedOctetCount, pFile);
+      if (data->fileDataLength < data->type.stream.requestedOctetCount)
+        data->endOfFile = true;
+      else
+        data->endOfFile = false;
       fclose(pFile);
     }
     else