diff --git a/headers/private/media/DataExchange.h b/headers/private/media/DataExchange.h
index 536380e323..550313da9a 100644
--- a/headers/private/media/DataExchange.h
+++ b/headers/private/media/DataExchange.h
@@ -72,8 +72,6 @@ enum {
 
 	MEDIA_SERVER_GET_FORMATS,
 	MEDIA_SERVER_MAKE_FORMAT_FOR,
-
-	MEDIA_SERVER_READY,
 };
 
 // Raw port based communication
diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp
index 5f0073fe5c..a837c3a0fc 100644
--- a/src/servers/media/media_server.cpp
+++ b/src/servers/media/media_server.cpp
@@ -141,7 +141,8 @@ ServerApp::ServerApp()
 
 void ServerApp::ReadyToRun()
 {
-	be_app_messenger.SendMessage(MEDIA_SERVER_READY);
+	gAppManager->StartAddonServer();
+	gAddOnManager->LoadState();
 }
 
 ServerApp::~ServerApp()
@@ -732,11 +733,6 @@ ServerApp::MessageReceived(BMessage *msg)
 {
 	TRACE("ServerApp::MessageReceived %lx enter\n", msg->what);
 	switch (msg->what) {
-		case MEDIA_SERVER_READY:
-			gAppManager->StartAddonServer();
-			gAddOnManager->LoadState();
-			break;
-
 		case MEDIA_SERVER_REQUEST_NOTIFICATIONS:
 		case MEDIA_SERVER_CANCEL_NOTIFICATIONS:
 		case MEDIA_SERVER_SEND_NOTIFICATIONS: