diff --git a/modules/sane_user/HGSaneImpl.cpp b/modules/sane_user/HGSaneImpl.cpp
index d2527071..f70a773b 100644
--- a/modules/sane_user/HGSaneImpl.cpp
+++ b/modules/sane_user/HGSaneImpl.cpp
@@ -1059,7 +1059,7 @@ void HGAPI HGSaneDeviceImpl::ThreadFunc(HGThread thread, HGPointer param)
 
         SANE_Int readSize = 0;
         SANE_Status stat2 = SANE_STATUS_GOOD;
-        while (readSize < bufferSize)
+        while (SANE_STATUS_EOF != stat2)
         {
             SANE_Int len = 0;
             stat2 = saneAPI.sane_read_api(p->m_devHandle, buffer + readSize, bufferSize - readSize, &len);