diff --git a/src/Compiler/Compiler.php b/src/Compiler/Compiler.php
index 50614db..e2a0d4b 100644
--- a/src/Compiler/Compiler.php
+++ b/src/Compiler/Compiler.php
@@ -203,6 +203,7 @@ public static function compileClassComponentOpening(string $component, string $a
     {
         return implode("\n", [
             '<?php if (isset($component)) { $__componentOriginal'.$hash.' = $component; } ?>',
+            '<?php if (isset($attributes)) { $__attributesOriginal'.$hash.' = $attributes; } ?>',
             '<?php $component = '.$component.'::resolve('.($data ?: '[]').' + (isset($attributes) && $attributes instanceof Illuminate\View\ComponentAttributeBag ? (array) $attributes->getIterator() : [])); ?>',
             '<?php $component->withName('.$alias.'); ?>',
             '<?php if ($component->shouldRender()): ?>',
diff --git a/src/Compiler/Concerns/CompilesComponents.php b/src/Compiler/Concerns/CompilesComponents.php
index 5b6bf00..348784f 100644
--- a/src/Compiler/Concerns/CompilesComponents.php
+++ b/src/Compiler/Concerns/CompilesComponents.php
@@ -43,6 +43,10 @@ public function compileEndComponentClass(): string
         $hash = array_pop(Compiler::$componentHashStack);
 
         return $this->compileEndComponent()."\n".implode("\n", [
+            '<?php endif; ?>',
+            '<?php if (isset($__attributesOriginal'.$hash.')): ?>',
+            '<?php $attributes = $__attributesOriginal'.$hash.'; ?>',
+            '<?php unset($__attributesOriginal'.$hash.'); ?>',
             '<?php endif; ?>',
             '<?php if (isset($__componentOriginal'.$hash.')): ?>',
             '<?php $component = $__componentOriginal'.$hash.'; ?>',
diff --git a/tests/Compiler/BladeComponentTagCompilerTest.php b/tests/Compiler/BladeComponentTagCompilerTest.php
index ec0d6a6..5942100 100644
--- a/tests/Compiler/BladeComponentTagCompilerTest.php
+++ b/tests/Compiler/BladeComponentTagCompilerTest.php
@@ -810,7 +810,7 @@ public function testAttributesTreatedAsPropsAreRemovedFromFinalAttributes()
         eval(" ?> $template <?php ");
         ob_get_clean();
 
-        $this->assertNull($attributes->get('userId'));
+        $this->assertSame($attributes->get('userId'), 'bar');
         $this->assertSame($attributes->get('other'), 'ok');
     }
 
diff --git a/tests/Compiler/BladeComponentsTest.php b/tests/Compiler/BladeComponentsTest.php
index 45a88b5..26400de 100644
--- a/tests/Compiler/BladeComponentsTest.php
+++ b/tests/Compiler/BladeComponentsTest.php
@@ -18,6 +18,7 @@ public function testComponentsAreCompiled()
     public function testClassComponentsAreCompiled()
     {
         $this->assertSame('<?php if (isset($component)) { $__componentOriginald797ca481a3632d6131474d33f4e32d7 = $component; } ?>
+<?php if (isset($attributes)) { $__attributesOriginald797ca481a3632d6131474d33f4e32d7 = $attributes; } ?>
 <?php $component = Stillat\BladeParser\Tests\Compiler\ComponentStub::class::resolve(["foo" => "bar"] + (isset($attributes) && $attributes instanceof Illuminate\View\ComponentAttributeBag ? (array) $attributes->getIterator() : [])); ?>
 <?php $component->withName(\'test\'); ?>
 <?php if ($component->shouldRender()): ?>
@@ -37,6 +38,10 @@ public function testEndComponentClassesAreCompiled()
 
         $this->assertSame('<?php echo $__env->renderComponent(); ?>
 <?php endif; ?>
+<?php if (isset($__attributesOriginal79aef92e83454121ab6e5f64077e7d8a)): ?>
+<?php $attributes = $__attributesOriginal79aef92e83454121ab6e5f64077e7d8a; ?>
+<?php unset($__attributesOriginal79aef92e83454121ab6e5f64077e7d8a); ?>
+<?php endif; ?>
 <?php if (isset($__componentOriginal79aef92e83454121ab6e5f64077e7d8a)): ?>
 <?php $component = $__componentOriginal79aef92e83454121ab6e5f64077e7d8a; ?>
 <?php unset($__componentOriginal79aef92e83454121ab6e5f64077e7d8a); ?>