diff --git a/server/entity/firework.go b/server/entity/firework.go
index cd7901e07..c3dbb5b29 100644
--- a/server/entity/firework.go
+++ b/server/entity/firework.go
@@ -21,7 +21,9 @@ func NewFireworkAttached(opts world.EntitySpawnOpts, firework item.Firework, own
 	conf.Firework = firework
 	conf.ExistenceDuration = firework.RandomisedDuration()
 	conf.Attached = attached
-	conf.Owner = owner.H()
+	if attached {
+		conf.Owner = owner.H()
+	}
 	return opts.New(FireworkType, conf)
 }