diff --git a/src/servers/media_addon/MediaAddonServer.cpp b/src/servers/media_addon/MediaAddonServer.cpp
index 9924bb5fc1..475add71c7 100644
--- a/src/servers/media_addon/MediaAddonServer.cpp
+++ b/src/servers/media_addon/MediaAddonServer.cpp
@@ -335,12 +335,12 @@ MediaAddonServer::QuitRequested()
 		fSystemTimeSource = NULL;
 	}
 
-	BMediaRoster::CurrentRoster()->Lock();
-	BMediaRoster::CurrentRoster()->Quit();
-
 	for (iterator = fInfoMap.begin(); iterator != fInfoMap.end(); iterator++)
 		_PutAddonIfPossible(iterator->second);
 
+	BMediaRoster::CurrentRoster()->Lock();
+	BMediaRoster::CurrentRoster()->Quit();
+
 	return true;
 }