diff --git a/.changeset/poor-doors-visit.md b/.changeset/poor-doors-visit.md
new file mode 100644
index 000000000..e28b12121
--- /dev/null
+++ b/.changeset/poor-doors-visit.md
@@ -0,0 +1,8 @@
+---
+"@apollo/federation-internals": patch
+"@apollo/subgraph": patch
+---
+
+Revert change to @composeDirective definition to specify nullable argument value.
+
+We cannot fix the definition as that would break customers using older versions of `subgraph-js`. Our validations are already verifying that the values are specified.
diff --git a/.changeset/silly-olives-reflect.md b/.changeset/silly-olives-reflect.md
new file mode 100644
index 000000000..8b35c7ad1
--- /dev/null
+++ b/.changeset/silly-olives-reflect.md
@@ -0,0 +1,11 @@
+---
+"@apollo/composition": patch
+---
+
+Improve error messages when @composeDirective arguments are NULL or empty strings.
+
+Previous message on undefined/null argument value
+`Cannot read properties of undefined (reading '0')`
+
+New message
+`Argument to @composeDirective in subgraph "${sg.name}" cannot be NULL or an empty String`