@@ -37,11 +37,11 @@
 @interface OFTarArchive_FileReadStream: OFStream <OFReadyForReadingObserving>
 {
 	OFTarArchiveEntry *_entry;
 	OF_KINDOF(OFStream *) _stream;
 	uint64_t _toRead;
-	bool _atEndOfStream;
+	bool _atEndOfStream, _skipped;
 }
 
 - (instancetype)of_initWithStream: (OFStream *)stream
 			    entry: (OFTarArchiveEntry *)entry;
 - (void)of_skip;
@@ -359,11 +359,11 @@
 	[super close];
 }
 
 - (void)of_skip
 {
-	if (_stream == nil || _toRead == 0)
+	if (_stream == nil || _skipped)
 		return;
 
 	if ([_stream isKindOfClass: [OFSeekableStream class]] &&
 	    _toRead <= INT64_MAX && (of_offset_t)_toRead == (int64_t)_toRead) {
 		uint64_t size;
@@ -398,10 +398,12 @@
 
 		if (size % 512 != 0)
 			[_stream readIntoBuffer: buffer
 				    exactLength: (size_t)(512 - (size % 512))];
 	}
+
+	_skipped = true;
 }
 @end
 
 @implementation OFTarArchive_FileWriteStream
 - (instancetype)of_initWithStream: (OF_KINDOF(OFStream *))stream