diff --git a/internal/kibana/space.go b/internal/kibana/space.go
index 908e3e213..a095c6238 100644
--- a/internal/kibana/space.go
+++ b/internal/kibana/space.go
@@ -121,12 +121,7 @@ func resourceSpaceUpsert(ctx context.Context, d *schema.ResourceData, meta inter
 		}
 	}
 
-	id, diags := client.ID(ctx, spaceResponse.ID)
-	if diags.HasError() {
-		return diags
-	}
-
-	d.SetId(id.String())
+	d.SetId(spaceResponse.ID)
 
 	return resourceSpaceRead(ctx, d, meta)
 }
@@ -136,11 +131,10 @@ func resourceSpaceRead(ctx context.Context, d *schema.ResourceData, meta interfa
 	if diags.HasError() {
 		return diags
 	}
-	compId, diags := clients.CompositeIdFromStr(d.Id())
-	if diags.HasError() {
-		return diags
+	id := d.Id()
+	if compId, diags := clients.CompositeIdFromStr(id); diags == nil {
+		id = compId.ResourceId
 	}
-	id := compId.ResourceId
 
 	kibana, err := client.GetKibanaClient()
 	if err != nil {
@@ -184,9 +178,9 @@ func resourceSpaceDelete(ctx context.Context, d *schema.ResourceData, meta inter
 	if diags.HasError() {
 		return diags
 	}
-	compId, diags := clients.CompositeIdFromStr(d.Id())
-	if diags.HasError() {
-		return diags
+	id := d.Id()
+	if compId, diags := clients.CompositeIdFromStr(id); diags == nil {
+		id = compId.ResourceId
 	}
 
 	kibana, err := client.GetKibanaClient()
@@ -194,7 +188,7 @@ func resourceSpaceDelete(ctx context.Context, d *schema.ResourceData, meta inter
 		return diag.FromErr(err)
 	}
 
-	err = kibana.KibanaSpaces.Delete(compId.ResourceId)
+	err = kibana.KibanaSpaces.Delete(id)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/internal/kibana/space_test.go b/internal/kibana/space_test.go
index 5cef8b750..16a4d25da 100644
--- a/internal/kibana/space_test.go
+++ b/internal/kibana/space_test.go
@@ -44,7 +44,6 @@ func TestAccResourceSpace(t *testing.T) {
 func testAccResourceSpaceCreate(id string) string {
 	return fmt.Sprintf(`
 provider "elasticstack" {
-  elasticsearch {}
   kibana {}
 }
 
@@ -59,7 +58,6 @@ resource "elasticstack_kibana_space" "test_space" {
 func testAccResourceSpaceUpdate(id string) string {
 	return fmt.Sprintf(`
 provider "elasticstack" {
-  elasticsearch {}
   kibana {}
 }
 
@@ -82,19 +80,18 @@ func checkResourceSpaceDestroy(s *terraform.State) error {
 		if rs.Type != "elasticstack_kibana_space" {
 			continue
 		}
-		compId, _ := clients.CompositeIdFromStr(rs.Primary.ID)
 
 		kibanaClient, err := client.GetKibanaClient()
 		if err != nil {
 			return err
 		}
-		res, err := kibanaClient.KibanaSpaces.Get(compId.ResourceId)
+		res, err := kibanaClient.KibanaSpaces.Get(rs.Primary.ID)
 		if err != nil {
 			return err
 		}
 
 		if res != nil {
-			return fmt.Errorf("Space (%s) still exists", compId.ResourceId)
+			return fmt.Errorf("Space (%s) still exists", rs.Primary.ID)
 		}
 	}
 	return nil