diff --git a/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/DefaultWorkspace.java b/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/DefaultWorkspace.java
index a3739a7081..c4069bc7f9 100644
--- a/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/DefaultWorkspace.java
+++ b/deegree-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/DefaultWorkspace.java
@@ -367,10 +367,16 @@ public <T extends Resource> T init(ResourceIdentifier<T> id, PreparedResources p
 		List<ResourceMetadata<? extends Resource>> mdList = new ArrayList<ResourceMetadata<? extends Resource>>();
 		ResourceMetadata<? extends Resource> md = resourceMetadata.get(id);
 		mdList.add(md);
-		graph.insertNode(md);
-		List<ResourceMetadata<? extends Resource>> dependencies = new ArrayList<ResourceMetadata<?>>();
-		WorkspaceUtils.collectDependencies(dependencies, graph.getNode(id));
-		mdList.addAll(dependencies);
+		for (ResourceIdentifier<?> dependencyId : md.getDependencies()) {
+			ResourceMetadata<? extends Resource> dependencyMd = resourceMetadata.get(dependencyId);
+			mdList.add(dependencyMd);
+		}
+		for (ResourceIdentifier<?> dependencyId : md.getSoftDependencies()) {
+			ResourceMetadata<? extends Resource> dependencyMd = resourceMetadata.get(dependencyId);
+			if (dependencyMd != null) {
+				mdList.add(dependencyMd);
+			}
+		}
 
 		ResourceGraph g = new ResourceGraph(mdList);
 		mdList = g.toSortedList();
@@ -380,6 +386,7 @@ public <T extends Resource> T init(ResourceIdentifier<T> id, PreparedResources p
 				LOG.info("Resource {} already available.", metadata.getIdentifier());
 				continue;
 			}
+			graph.insertNode(metadata);
 			ResourceBuilder<? extends Resource> builder = prepared.getBuilder(metadata.getIdentifier());
 			LOG.info("Building resource {}.", metadata.getIdentifier());
 			try {
@@ -518,7 +525,7 @@ public <T extends Resource> void add(ResourceLocation<T> location) {
 
 	@Override
 	public <T extends Resource> void destroy(ResourceIdentifier<T> id) {
-		List<ResourceIdentifier<T>> resourcesToRemove = collectResourcesToDestroy(id);
+		List<ResourceIdentifier<?>> resourcesToRemove = collectResourcesToDestroy(id);
 
 		for (ResourceIdentifier resourceId : resourcesToRemove) {
 			T res = (T) resources.get(resourceId);
@@ -534,14 +541,14 @@ public <T extends Resource> void destroy(ResourceIdentifier<T> id) {
 		}
 	}
 
-	private <T extends Resource> List<ResourceIdentifier<T>> collectResourcesToDestroy(ResourceIdentifier<T> id) {
-		List<ResourceIdentifier<T>> resourcesToRemove = new ArrayList<>();
-		ResourceNode<T> node = graph.getNode(id);
+	private List<ResourceIdentifier<?>> collectResourcesToDestroy(ResourceIdentifier<?> id) {
+		List<ResourceIdentifier<?>> resourcesToRemove = new ArrayList<>();
+		ResourceNode<?> node = graph.getNode(id);
 		if (node == null) {
 			return resourcesToRemove;
 		}
 		for (ResourceNode<? extends Resource> n : node.getDependents()) {
-			collectResourcesToDestroy(n.getMetadata().getIdentifier());
+			resourcesToRemove.addAll(collectResourcesToDestroy(n.getMetadata().getIdentifier()));
 		}
 		resourcesToRemove.add(id);
 		return resourcesToRemove;
diff --git a/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java b/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
index 325e507c79..ed6d89df4f 100644
--- a/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
+++ b/deegree-tests/deegree-resource-deps-tests/src/test/java/org/deegree/workspace/SimpleSqlFeatureStoreTest.java
@@ -131,7 +131,6 @@ public void testResourceGraph() {
 	}
 
 	@Test
-	@Ignore
 	public void testDestroySingle() {
 		FeatureStore fs = workspace.getResource(FeatureStoreProvider.class, "simplesql-ok");
 		Assert.assertNotNull("Feature store is expected to be created.", fs);
@@ -144,7 +143,6 @@ public void testDestroySingle() {
 	}
 
 	@Test
-	@Ignore
 	public void testDestroyInitializeSingle() {
 		FeatureStore fs = workspace.getResource(FeatureStoreProvider.class, "simplesql-ok");
 		Assert.assertNotNull("Feature store is expected to be created.", fs);
@@ -158,7 +156,6 @@ public void testDestroyInitializeSingle() {
 	}
 
 	@Test
-	@Ignore
 	public void testReinitializeChain() {
 		FeatureStore fs = workspace.getResource(FeatureStoreProvider.class, "simplesql-ok");
 		Assert.assertNotNull("Feature store is expected to be created.", fs);