diff --git a/stackit/internal/resources/postgres-flex/instance/actions.go b/stackit/internal/resources/postgres-flex/instance/actions.go
index 68ecc201..1ab86a27 100644
--- a/stackit/internal/resources/postgres-flex/instance/actions.go
+++ b/stackit/internal/resources/postgres-flex/instance/actions.go
@@ -208,9 +208,9 @@ func (r Resource) createUser(ctx context.Context, plan *Instance, d *diag.Diagno
 		db := ""
 		if item.Database != nil {
 			db = *item.Database
-			if db == "" {
-				db = database // bypass API issue
-			}
+		}
+		if db == "" {
+			db = database // bypass API issue
 		}
 		pw := ""
 		if item.Password != nil {