diff --git a/src/context/service/grpc_server/ContextServiceServicerImpl.py b/src/context/service/grpc_server/ContextServiceServicerImpl.py
index bf51bf316eae877c726ab1a49589cbfc1015fc7e..9952444b7ac004a0c18748ad2921431ac012de6d 100644
--- a/src/context/service/grpc_server/ContextServiceServicerImpl.py
+++ b/src/context/service/grpc_server/ContextServiceServicerImpl.py
@@ -195,7 +195,7 @@ class ContextServiceServicerImpl(ContextServiceServicer):
         return TopologyList(topologies=[db_topology.dump() for db_topology in db_topologies])
 
     @safe_and_metered_rpc_method(METRICS, LOGGER)
-    def GetTopology(self, request: TopologyId, contextt : grpc.ServicerContext) -> Topology:
+    def GetTopology(self, request: TopologyId, context : grpc.ServicerContext) -> Topology:
         context_uuid = request.context_id.context_uuid.uuid
         topology_uuid = request.topology_uuid.uuid
 
@@ -215,10 +215,9 @@ class ContextServiceServicerImpl(ContextServiceServicer):
         with self.session() as session:
             db_context: ContextModel = session.query(ContextModel).filter_by(context_uuid=context_uuid).one()
 
-        topology_add = TopologyModel(topology_uuid=topology_uuid, context_fk=context_uuid)
-        topology_add.context = db_context
-        updated = True
-        with self.session() as session:
+            topology_add = TopologyModel(topology_uuid=topology_uuid, context_fk=context_uuid)
+            topology_add.context = db_context
+            updated = True
             result = session.query(TopologyModel).join(TopologyModel.context).filter(TopologyModel.topology_uuid==topology_uuid).options(contains_eager(TopologyModel.context)).one_or_none()
 
             if not result: