diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index d9496cc..431afe1 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -105,7 +105,7 @@
 	@Override
 	public void start(UserInfo userInfo, String endpoint, @Project String name) {
 		projectActionOnCloud(userInfo, name, START_PRJ_API, endpoint);
-		projectDAO.updateStatus(name, ProjectDTO.Status.ACTIVATING);
+		projectDAO.updateEdgeStatus(name, endpoint, UserInstanceStatus.STARTING);
 	}
 
 	@Override
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImplTest.java
index 6e47ca1..09784eb 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EdgeServiceImplTest.java
@@ -216,7 +216,7 @@
 		try {
 			edgeService.terminate(userInfo);
 		} catch (DlabException e) {
-			assertEquals("Could not terminate EDGE node: " +
+			assertEquals("Could not terminate EDGE node: Could not infrastructure/edge/terminate EDGE node : " +
 					"Cannot create instance of resource class ", e.getMessage());
 		}
 		verify(keyDAO).getEdgeStatus(USER);