diff --git a/src/add-ons/media/plugins/xvid_decoder/xvidDecoderPlugin.cpp b/src/add-ons/media/plugins/xvid_decoder/xvidDecoderPlugin.cpp
index 6d36a5232d..e9da0d9684 100644
--- a/src/add-ons/media/plugins/xvid_decoder/xvidDecoderPlugin.cpp
+++ b/src/add-ons/media/plugins/xvid_decoder/xvidDecoderPlugin.cpp
@@ -67,13 +67,6 @@ xvidDecoder::Setup(media_format *ioEncodedFormat,
 				  const void *infoBuffer, int32 infoSize)
 {
 	int xerr;
-	static BLocker locker;
-	static bool initdone = false;
-	BAutolock lock(locker);
-	if (initdone) {
-		TRACE("xvidDecoder::Setup called twice\n");
-		return B_ERROR;
-	}
 
 	if (ioEncodedFormat->type != B_MEDIA_ENCODED_VIDEO) {
 		TRACE("xvidDecoder::Setup not called with encoded video");