diff --git a/src/kits/media/PluginManager.cpp b/src/kits/media/PluginManager.cpp
index 1f19410124..4b483d320a 100644
--- a/src/kits/media/PluginManager.cpp
+++ b/src/kits/media/PluginManager.cpp
@@ -239,8 +239,8 @@ PluginManager::PutPlugin(MediaPlugin *plugin)
 			if (pinfo->usecount == 0) {
 				delete pinfo->plugin;
 				unload_add_on(pinfo->image);
+				fPluginList->RemoveCurrent();
 			}
-			fPluginList->RemoveCurrent();
 			fLocker->Unlock();
 			return;
 		}