diff --git a/ryzom/client/src/commands.cpp b/ryzom/client/src/commands.cpp
index 00d2b9e4f..117eecbe0 100644
--- a/ryzom/client/src/commands.cpp
+++ b/ryzom/client/src/commands.cpp
@@ -222,6 +222,7 @@ GROUP COMMANDS
 ***********************************************************************/
 
 
+#ifdef RYZOM_FORGE
 NLMISC_COMMAND(listGroup, "list all available group", "")
 {
 	CItemGroupManager::getInstance()->listGroup();
@@ -361,6 +362,8 @@ NLMISC_COMMAND(deleteGroup, "delete group <name>", "name")
 		return false;
 	}
 }
+#endif
+
 
 NLMISC_COMMAND(naked, "get naked !", "")
 {
diff --git a/ryzom/client/src/events_listener.cpp b/ryzom/client/src/events_listener.cpp
index cfa9d2b3c..9add2ecf2 100644
--- a/ryzom/client/src/events_listener.cpp
+++ b/ryzom/client/src/events_listener.cpp
@@ -134,7 +134,9 @@ void CEventsListener::operator()(const CEvent& event)
 	{
 		// Interface saving
 		CInterfaceManager::getInstance()->uninitInGame0();
+#ifdef RYZOM_FORGE
 		CItemGroupManager::getInstance()->uninit();
+#endif
 
 
 		/* YOYO:
diff --git a/ryzom/client/src/far_tp.cpp b/ryzom/client/src/far_tp.cpp
index c3c9763c0..d7b636d67 100644
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@@ -1306,7 +1306,9 @@ void CFarTP::sendReady()
 			// Instead of doing it in disconnectFromPreviousShard(), we do it here, only when it's needed
 			ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled;
 			pIM->uninitInGame0();
+#ifdef RYZOM_FORGE
 			CItemGroupManager::getInstance()->uninit();
+#endif
 
 			ClientCfg.R2EDEnabled = ! ClientCfg.R2EDEnabled;
 			ActionsContext.removeAllCombos();
diff --git a/ryzom/client/src/init_main_loop.cpp b/ryzom/client/src/init_main_loop.cpp
index 959d6bbdd..69a49da20 100644
--- a/ryzom/client/src/init_main_loop.cpp
+++ b/ryzom/client/src/init_main_loop.cpp
@@ -739,7 +739,9 @@ void initMainLoop()
 		ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
 		//nlinfo("****** InGame Interface Parsing and Init START ******");
 		pIM->initInGame(); // must be called after waitForUserCharReceived() because Ring information is used by initInGame()
+#ifdef RYZOM_FORGE
 		CItemGroupManager::getInstance()->init(); // Init at the same time keys.xml is loaded
+#endif
 		initLast = initCurrent;
 		initCurrent = ryzomGetLocalTime();
 		//nlinfo ("PROFILE: %d seconds (%d total) for Initializing ingame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
diff --git a/ryzom/client/src/interface_v3/action_handler_item.cpp b/ryzom/client/src/interface_v3/action_handler_item.cpp
index 5e7b0cc6c..85e4cb180 100644
--- a/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -2025,6 +2025,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 		}
 
 		//Item GROUP logic
+#ifdef RYZOM_FORGE
 		CGroupMenu   *pGroupRootMenu = dynamic_cast<CGroupMenu*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag:item_group_menu"));
 		if(pGroupRootMenu)
 		{
@@ -2096,6 +2097,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			}
 
 		}
+#endif
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerItemMenuCheck, "item_menu_check" );
@@ -2329,6 +2331,7 @@ class CHandlerRingXpCatalyserStopUse : public IActionHandler
 REGISTER_ACTION_HANDLER( CHandlerRingXpCatalyserStopUse, "ring_xp_catalyser_stop_use" );
 
 
+#ifdef RYZOM_FORGE
 // ***************************************************************************
 // item groups
 class CHandlerItemGroupMove : public IActionHandler
@@ -2365,3 +2368,4 @@ class CHandlerItemGroupEquip : public IActionHandler
 	}
 };
 REGISTER_ACTION_HANDLER(CHandlerItemGroupEquip, "item_group_equip");
+#endif
\ No newline at end of file
diff --git a/ryzom/client/src/interface_v3/interface_manager.cpp b/ryzom/client/src/interface_v3/interface_manager.cpp
index fcade5008..4b071edc3 100644
--- a/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1611,7 +1611,9 @@ void CInterfaceManager::updateFrameEvents()
 	CBGDownloaderAccess::getInstance().update();
 #endif
 
+#ifdef RYZOM_FORGE
 	CItemGroupManager::getInstance()->update();
+#endif
 
 }
 
diff --git a/ryzom/client/src/item_group_manager.cpp b/ryzom/client/src/item_group_manager.cpp
index e1fc52eb7..c074bb009 100644
--- a/ryzom/client/src/item_group_manager.cpp
+++ b/ryzom/client/src/item_group_manager.cpp
@@ -19,6 +19,7 @@
 
 #include "stdpch.h"
 
+#ifdef RYZOM_FORGE
 #include "item_group_manager.h"
 #include "interface_v3/inventory_manager.h"
 #include "nel/gui/widget_manager.h"
@@ -833,3 +834,5 @@ void CItemGroupManager::releaseInstance()
 		delete _Instance;
 	_Instance = NULL;
 }
+
+#endif
diff --git a/ryzom/client/src/item_group_manager.h b/ryzom/client/src/item_group_manager.h
index a4ff46c43..c476c630a 100644
--- a/ryzom/client/src/item_group_manager.h
+++ b/ryzom/client/src/item_group_manager.h
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+#ifdef RYZOM_FORGE
 #ifndef RY_ITEM_GROUP_MANAGER_H
 #define RY_ITEM_GROUP_MANAGER_H
 #include <limits>
@@ -128,3 +128,4 @@ private:
 };
 
 #endif // RY_ITEM_GROUP_MANAGER_H
+#endif
diff --git a/ryzom/client/src/main_loop.cpp b/ryzom/client/src/main_loop.cpp
index 5b9a071b2..9e295bacf 100644
--- a/ryzom/client/src/main_loop.cpp
+++ b/ryzom/client/src/main_loop.cpp
@@ -2589,7 +2589,9 @@ bool mainLoop()
 
 		// Interface saving
 		CInterfaceManager::getInstance()->uninitInGame0();
+#ifdef RYZOM_FORGE
 		CItemGroupManager::getInstance()->uninit();
+#endif
 
 		/////////////////////////////////
 		// Display the end background. //
diff --git a/ryzom/client/src/release.cpp b/ryzom/client/src/release.cpp
index 0e6d526c6..ccb09646e 100644
--- a/ryzom/client/src/release.cpp
+++ b/ryzom/client/src/release.cpp
@@ -237,7 +237,9 @@ void	releaseMainLoopReselect()
 
 	// save keys loaded and interface cfg (not done in releaseMainLoop() because done at end of mainLoop()...)
 	pIM->uninitInGame0();
+#ifdef RYZOM_FORGE
 	CItemGroupManager::getInstance()->uninit();
+#endif
 
 	// alredy called from farTPMainLoop()
 	// --R2::getEditor().autoConfigRelease(IsInRingSession);