diff --git a/src/kits/media/FormatManager.cpp b/src/kits/media/FormatManager.cpp
index 29cd2e98b7..0968320bf6 100644
--- a/src/kits/media/FormatManager.cpp
+++ b/src/kits/media/FormatManager.cpp
@@ -143,11 +143,10 @@ FormatManager::CreateInstance()
 /* static */ FormatManager*
 FormatManager::GetInstance()
 {
-	static FormatManager* sFormatManager = NULL;
-	if (sFormatManager == NULL)
+	if (sInstance == NULL)
 		pthread_once(&sInitOnce, &CreateInstance);
 
-	return sFormatManager;
+	return sInstance;
 }