diff --git a/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.input.tsx b/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.input.tsx
index 663dd1f7248..fa04bd5a59e 100644
--- a/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.input.tsx
+++ b/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.input.tsx
@@ -5,6 +5,7 @@ import { Container } from '@toptal/picasso'
 
 const test = 'large'
 const booleanVariable = true
+const extraProps = { align: 'left '}
 
 export default () => (
   <>
@@ -13,6 +14,7 @@ export default () => (
     <Container bottom={1.5}>Content</Container>
     <Container left={1.6}>Content</Container>
     <Container top={booleanVariable ? 'small' : 1.5}>Content</Container>
+    <Container {...extraProps}>Content</Container>
     <Dropdown
       someProp='small'
       offset={{
diff --git a/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.output.tsx b/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.output.tsx
index 9e40a6cfb4b..91a5bdaf06f 100644
--- a/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.output.tsx
+++ b/packages/picasso-codemod/src/v100.0.0/__testfixtures__/default.output.tsx
@@ -6,6 +6,7 @@ import { Container } from '@toptal/picasso'
 
 const test = 'large'
 const booleanVariable = true
+const extraProps = { align: 'left '}
 
 export default () => (
   <>
@@ -14,6 +15,7 @@ export default () => (
     <Container bottom={SPACING_6}>Content</Container>
     <Container left={1.6}>Content</Container>
     <Container top={booleanVariable ? SPACING_4 : SPACING_6}>Content</Container>
+    <Container {...extraProps}>Content</Container>
     <Dropdown
       someProp='small'
       offset={{
diff --git a/packages/picasso-codemod/src/v100.0.0/spacing-values.ts b/packages/picasso-codemod/src/v100.0.0/spacing-values.ts
index 0ada1fa7bbd..58b6ec18f55 100644
--- a/packages/picasso-codemod/src/v100.0.0/spacing-values.ts
+++ b/packages/picasso-codemod/src/v100.0.0/spacing-values.ts
@@ -134,9 +134,12 @@ const transform: Transform = (file, api) => {
     .forEach(element => {
       const updatedElementAttributes =
         element.node.openingElement.attributes.map(attribute => {
-          const attributeName = attribute.name.name
+          const attributeName = attribute.name?.name
 
-          if (AFFECTED_ATTRIBUTES.indexOf(attributeName) === -1) {
+          if (
+            !attributeName ||
+            AFFECTED_ATTRIBUTES.indexOf(attributeName) === -1
+          ) {
             return attribute
           }