diff --git a/src/Root.cpp b/src/Root.cpp
index 55e1c1156..e309bb174 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -154,7 +154,7 @@ void cRoot::Start(void)
 		m_WebAdmin->Init();
 
 		LOGD("Loading settings...");
-		m_RankManager = new cRankManager();
+		m_RankManager.reset(new cRankManager());
 		m_RankManager->Initialize(m_MojangAPI);
 		m_CraftingRecipes = new cCraftingRecipes;
 		m_FurnaceRecipe   = new cFurnaceRecipe();
diff --git a/src/Root.h b/src/Root.h
index ec6b83fcc..29753a47d 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -86,7 +86,7 @@ public:
 	cPluginManager *   GetPluginManager  (void) { return m_PluginManager; }    // tolua_export
 	cAuthenticator &   GetAuthenticator  (void) { return m_Authenticator; }
 	cMojangAPI &       GetMojangAPI      (void) { return m_MojangAPI; }
-	cRankManager *     GetRankManager    (void) { return m_RankManager; }
+	cRankManager *     GetRankManager    (void) { return m_RankManager.get(); }
 
 	/** Queues a console command for execution through the cServer class.
 	The command will be executed in the tick thread
@@ -188,7 +188,9 @@ private:
 	cPluginManager *   m_PluginManager;
 	cAuthenticator     m_Authenticator;
 	cMojangAPI         m_MojangAPI;
-	cRankManager *     m_RankManager;
+
+	std::unique_ptr<cRankManager> m_RankManager;
+
 	cHTTPServer        m_HTTPServer;
 
 	bool m_bStop;