diff --git a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
index f91b85a..46d1d02 100644
--- a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
+++ b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
@@ -138,8 +138,7 @@ public class ServiceContext extends GCUBEServiceContext {
 			// register my profile
 			GCUBERunningInstance RegistryRIProfile = ServiceContext.getContext().getInstance();			
 			GCUBERIQuery query = client.getQuery(GCUBERIQuery.class);
-			query.addAtomicConditions(new AtomicCondition(
-					"//Endpoint@EntryName","gcube/informationsystem/registry/RegistryFactory"),new AtomicCondition("//ServiceName", this.getName()));
+			query.addAtomicConditions(new AtomicCondition("//ServiceClass", this.getServiceClass()),new AtomicCondition("//ServiceName", this.getName()));
 			if (this.client.execute(query, GHNContext.getContext().getDefaultScope()).size() == 0)
 				registerProfile(RegistryRIProfile, GCUBERunningInstance.TYPE);