diff --git a/src/add-ons/media/media-add-ons/dvb/DVBMediaAddon.cpp b/src/add-ons/media/media-add-ons/dvb/DVBMediaAddon.cpp
index f1f25f2f99..f676b13a7a 100644
--- a/src/add-ons/media/media-add-ons/dvb/DVBMediaAddon.cpp
+++ b/src/add-ons/media/media-add-ons/dvb/DVBMediaAddon.cpp
@@ -45,7 +45,7 @@ struct device_info
 };
 
 
-extern "C" BMediaAddOn * 
+extern "C" BMediaAddOn *
 make_media_addon(image_id id)
 {
 	return new DVBMediaAddon(id);
@@ -53,22 +53,8 @@ make_media_addon(image_id id)
 
 
 DVBMediaAddon::DVBMediaAddon(image_id id)
- :	BMediaAddOn(id)
+	: BMediaAddOn(id)
 {
-	// TODO: The following code block is a workaround for the bug #11018
-	// (https://dev.haiku-os.org/ticket/11018). Please remove this code block,
-	// once the bug is being resolved.
-	// The workaround triggers the loading of all media plugins prior to using
-	// methods of class BMediaFormats. Using the function get_next_encoder()
-	// is used because of two facts
-	//     1. It is publicly available and thus can be used by 3rd party apps,
-	//        too.
-	//     2. It is already available by including BMediaFormats.h, so there is
-	//        no need to include another header for this workaround.
-	int32 workaroundCookie = 0;
-	media_codec_info workaroundMediaCodecInfo;
-	get_next_encoder(&workaroundCookie, &workaroundMediaCodecInfo);
-
 	ScanFolder("/dev/dvb");
 }
 
diff --git a/src/tests/kits/media/mpeg2_decoder_test/mpeg2_decoder_test.cpp b/src/tests/kits/media/mpeg2_decoder_test/mpeg2_decoder_test.cpp
index fe9df4aced..d86fd1f9c3 100644
--- a/src/tests/kits/media/mpeg2_decoder_test/mpeg2_decoder_test.cpp
+++ b/src/tests/kits/media/mpeg2_decoder_test/mpeg2_decoder_test.cpp
@@ -120,27 +120,6 @@ main(int argc, char* argv[])
 	BFile* mpeg2EncodedFile = new BFile(kTestVideoFilename, O_RDONLY);
 	BMediaDecoder* mpeg2Decoder = new FileDecoder(mpeg2EncodedFile);
 
-	// TODO: The following code block is a workaround for the bug #11018
-	// (https://dev.haiku-os.org/ticket/11018). Please remove this code block,
-	// once the bug is being resolved.
-	// The workaround triggers the loading of all media plugins prior to using
-	// methods of class BMediaFormats. Using the function get_next_encoder()
-	// is used because of two facts
-	//     1. It is publicly available and thus can be used by 3rd party apps,
-	//        too.
-	//     2. It is already available by including BMediaFormats.h, so there is
-	//        no need to include another header for this workaround.
-	// Also, please leave the workaround code at this -prominent- place
-	// instead of moving it to the more appropriate place in
-	// CreateMpeg2MediaFormat(). This way it acts as a reminder to fix
-	// the bug :)
-	int32 workaroundCookie = 0;
-	media_codec_info workaroundMediaCodecInfo;
-	status_t workaroundStatus = get_next_encoder(&workaroundCookie,
-		&workaroundMediaCodecInfo);
-	if (workaroundStatus < B_OK)
-		exit(99);
-
 	media_format* mpeg2MediaFormat = CreateMpeg2MediaFormat();
 	mpeg2Decoder->SetTo(mpeg2MediaFormat);
 	status_t settingMpeg2DecoderStatus = mpeg2Decoder->InitCheck();