diff --git a/changelogs/fragments/server-race-condition-pg-attach.yml b/changelogs/fragments/server-race-condition-pg-attach.yml
new file mode 100644
index 0000000..1c7ac87
--- /dev/null
+++ b/changelogs/fragments/server-race-condition-pg-attach.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - hcloud_server - Server locked after attaching to placement group
diff --git a/plugins/modules/hcloud_server.py b/plugins/modules/hcloud_server.py
index 247dd3a..246c624 100644
--- a/plugins/modules/hcloud_server.py
+++ b/plugins/modules/hcloud_server.py
@@ -652,7 +652,7 @@ class AnsibleHcloudServer(Hcloud):
                     ):
                         self.stop_server_if_forced()
                         if not self.module.check_mode:
-                            self.hcloud_server.add_to_placement_group(placement_group)
+                            self.hcloud_server.add_to_placement_group(placement_group).wait_until_finished()
                         self._mark_as_changed()
 
             if "ipv4" in self.module.params: