diff --git a/flight/template/View.php b/flight/template/View.php
index 453f533..babcf5d 100644
--- a/flight/template/View.php
+++ b/flight/template/View.php
@@ -166,21 +166,13 @@ class View
                     $js = $component->js();
 
                     if ($css && !array_key_exists($template, $this->styles)) {
-                        $view .= <<<html
-                        <style>
-                            $css
-                        </style>
-                        html;
+                        $view .= $this->renderComponentStyle($css);
 
                         $this->styles[$template] = true;
                     }
 
                     if ($js && !array_key_exists($template, $this->scripts)) {
-                        $view .= <<<html
-                        <script>
-                            $js
-                        </script>
-                        html;
+                        $view .= $this->renderComponentScript($js);
 
                         $this->scripts[$template] = true;
                     }
@@ -328,4 +320,30 @@ class View
 
         return $arguments;
     }
+
+    private function renderComponentStyle(string $css): string
+    {
+        if (preg_match('/^\s*<style\b[^>]*>.*<\/style>\s*$/is', $css) === 1) {
+            return $css;
+        }
+
+        return <<<html
+        <style>
+            $css
+        </style>
+        html;
+    }
+
+    private function renderComponentScript(string $js): string
+    {
+        if (preg_match('/^\s*<script\b[^>]*>.*<\/script>\s*$/is', $js) === 1) {
+            return $js;
+        }
+
+        return <<<html
+        <script>
+            $js
+        </script>
+        html;
+    }
 }
diff --git a/tests/ViewTest.php b/tests/ViewTest.php
index 78c5d2d..1357fb7 100644
--- a/tests/ViewTest.php
+++ b/tests/ViewTest.php
@@ -343,6 +343,19 @@ class ViewTest extends TestCase
                 </style>
                 html,
             ],
+            [
+                'page-with-class-component-with-custom-style-tag',
+                <<<'html'
+                <span class="my-class-component-with-custom-style-tag">
+                    my-class-component-with-custom-style-tag
+                </span>
+                <style media="print" data-component="my-class-component-with-custom-style-tag">
+                    .my-class-component-with-custom-style-tag {
+                        color: purple;
+                    }
+                </style>
+                html,
+            ],
             [
                 'page-with-class-component-with-scripts',
                 <<<'html'
@@ -351,6 +364,15 @@ class ViewTest extends TestCase
                 <script>console.log('my-class-component-with-scripts')</script>
                 html,
             ],
+            [
+                'page-with-class-component-with-custom-script-tag',
+                <<<'html'
+                my-class-component-with-custom-script-tag
+                <script type="module" data-component="my-class-component-with-custom-script-tag">
+                    console.log('my-class-component-with-custom-script-tag')
+                </script>
+                html,
+            ],
             [
                 'page-with-class-component-that-extends-another-class-component',
                 <<<'html'
diff --git a/tests/views/components/my-class-component-with-custom-script-tag.php b/tests/views/components/my-class-component-with-custom-script-tag.php
new file mode 100644
index 0000000..87ee8b1
--- /dev/null
+++ b/tests/views/components/my-class-component-with-custom-script-tag.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use flight\template\Component;
+
+return new class extends Component
+{
+    public function html(): string
+    {
+        return 'my-class-component-with-custom-script-tag';
+    }
+
+    public function js(): string
+    {
+        return <<<'js'
+        <script type="module" data-component="my-class-component-with-custom-script-tag">
+            console.log('my-class-component-with-custom-script-tag')
+        </script>
+        js;
+    }
+};
diff --git a/tests/views/components/my-class-component-with-custom-style-tag.php b/tests/views/components/my-class-component-with-custom-style-tag.php
new file mode 100644
index 0000000..f6c65b8
--- /dev/null
+++ b/tests/views/components/my-class-component-with-custom-style-tag.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use flight\template\Component;
+
+return new class extends Component
+{
+    public function html(): string
+    {
+        return <<<'html'
+        <span class="my-class-component-with-custom-style-tag">
+            my-class-component-with-custom-style-tag
+        </span>
+        html;
+    }
+
+    public function css(): string
+    {
+        return <<<'css'
+        <style media="print" data-component="my-class-component-with-custom-style-tag">
+            .my-class-component-with-custom-style-tag {
+                color: purple;
+            }
+        </style>
+        css;
+    }
+};
diff --git a/tests/views/pages/page-with-class-component-with-custom-script-tag.php b/tests/views/pages/page-with-class-component-with-custom-script-tag.php
new file mode 100644
index 0000000..bec475e
--- /dev/null
+++ b/tests/views/pages/page-with-class-component-with-custom-script-tag.php
@@ -0,0 +1 @@
+<f-my-class-component-with-custom-script-tag />
diff --git a/tests/views/pages/page-with-class-component-with-custom-style-tag.php b/tests/views/pages/page-with-class-component-with-custom-style-tag.php
new file mode 100644
index 0000000..5f21043
--- /dev/null
+++ b/tests/views/pages/page-with-class-component-with-custom-style-tag.php
@@ -0,0 +1 @@
+<f-my-class-component-with-custom-style-tag />
