diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c
index acfde34a3a..10c0ea7960 100644
--- a/src/WINNT/afsd/cm_buf.c
+++ b/src/WINNT/afsd/cm_buf.c
@@ -896,6 +896,10 @@ void buf_Recycle(cm_buf_t *bp)
 
     /* make the fid unrecognizable */
     memset(&bp->fid, 0, sizeof(cm_fid_t));
+
+    /* clean up junk flags */
+    bp->flags &= ~(CM_BUF_EOF | CM_BUF_ERROR);
+    bp->dataVersion = CM_BUF_VERSION_BAD;	/* unknown so far */
 }       
 
 /* recycle a buffer, removing it from the free list, hashing in its new identity
@@ -1030,10 +1034,6 @@ long buf_GetNewLocked(struct cm_scache *scp, osi_hyper_t *offsetp, cm_req_t *req
              */
             buf_Recycle(bp);
 
-            /* clean up junk flags */
-            bp->flags &= ~(CM_BUF_EOF | CM_BUF_ERROR);
-            bp->dataVersion = CM_BUF_VERSION_BAD;	/* unknown so far */
-
             /* now hash in as our new buffer, and give it the
              * appropriate label, if requested.
              */