diff --git a/internal/services/azurestackhci/stack_hci_marketplace_gallery_image_resource.go b/internal/services/azurestackhci/stack_hci_marketplace_gallery_image_resource.go
index a927b8ac4c13..062386f83c86 100644
--- a/internal/services/azurestackhci/stack_hci_marketplace_gallery_image_resource.go
+++ b/internal/services/azurestackhci/stack_hci_marketplace_gallery_image_resource.go
@@ -194,6 +194,7 @@ func (r StackHCIMarketplaceGalleryImageResource) Create() sdk.ResourceFunc {
 				return fmt.Errorf("performing create %s: %+v", id, err)
 			}
 
+			// https://github.com/Azure/azure-rest-api-specs/issues/31876
 			if err := resourceMarketplaceGalleryImageWaitForCreated(ctx, *client, id); err != nil {
 				return fmt.Errorf("waiting for %s to be created: %+v", id, err)
 			}
diff --git a/internal/services/azurestackhci/stack_hci_network_interface_resource.go b/internal/services/azurestackhci/stack_hci_network_interface_resource.go
index 170b406e6586..49c6d3d580f8 100644
--- a/internal/services/azurestackhci/stack_hci_network_interface_resource.go
+++ b/internal/services/azurestackhci/stack_hci_network_interface_resource.go
@@ -182,8 +182,9 @@ func (r StackHCINetworkInterfaceResource) Create() sdk.ResourceFunc {
 				return fmt.Errorf("performing create %s: %+v", id, err)
 			}
 
+			// https://github.com/Azure/azure-rest-api-specs/issues/31876
 			if err := resourceNetworkInterfaceWaitForCreated(ctx, *client, id); err != nil {
-				return err
+				return fmt.Errorf("waiting for %s to be created: %+v", id, err)
 			}
 
 			metadata.SetID(id)
diff --git a/internal/services/azurestackhci/stack_hci_virtual_hard_disk_resource.go b/internal/services/azurestackhci/stack_hci_virtual_hard_disk_resource.go
index 15409627be5a..34af6f6219e7 100644
--- a/internal/services/azurestackhci/stack_hci_virtual_hard_disk_resource.go
+++ b/internal/services/azurestackhci/stack_hci_virtual_hard_disk_resource.go
@@ -210,8 +210,9 @@ func (r StackHCIVirtualHardDiskResource) Create() sdk.ResourceFunc {
 				return fmt.Errorf("performing create %s: %+v", id, err)
 			}
 
+			// https://github.com/Azure/azure-rest-api-specs/issues/31876
 			if err := resourceVirtualHardDiskWaitForCreated(ctx, *client, id); err != nil {
-				return err
+				return fmt.Errorf("waiting for %s to be created: %+v", id, err)
 			}
 
 			metadata.SetID(id)
diff --git a/internal/services/azurestackhci/stack_hci_windows_virtual_machine_resource.go b/internal/services/azurestackhci/stack_hci_windows_virtual_machine_resource.go
index 90e51808d5e4..ad8008e5c35c 100644
--- a/internal/services/azurestackhci/stack_hci_windows_virtual_machine_resource.go
+++ b/internal/services/azurestackhci/stack_hci_windows_virtual_machine_resource.go
@@ -443,8 +443,9 @@ func (r StackHCIWindowsVirtualMachineResource) Create() sdk.ResourceFunc {
 				return fmt.Errorf("creating %s: %+v", id, err)
 			}
 
+			// https://github.com/Azure/azure-rest-api-specs/issues/31876
 			if err := resourceVirtualMachineWaitForCreated(ctx, *client, id); err != nil {
-				return err
+				return fmt.Errorf("waiting for %s to be created: %+v", id, err)
 			}
 
 			metadata.SetID(id)