diff --git a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
index 6889abf..2da5322 100644
--- a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
+++ b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
@@ -87,7 +87,7 @@ public class OnlineObserver  implements AppManagerObserver{
 
 			for (Future<ApplicationManager> appManager: instanciatedManagerPerScope.get(context)){
 				service.execute(new ShutDownAppManager(secret, appManager));
-				provider.getAppmanagerMap().get(appManager).remove(context);
+				provider.getAppmanagerMap().get(appManager.getClass().getCanonicalName()).remove(context);
 			}
 			instanciatedManagerPerScope.remove(context);
 		} catch (Exception e1) {