diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesClasses.php b/src/Illuminate/View/Compilers/Concerns/CompilesClasses.php
index d2507e7116a1..a271b5f805ae 100644
--- a/src/Illuminate/View/Compilers/Concerns/CompilesClasses.php
+++ b/src/Illuminate/View/Compilers/Concerns/CompilesClasses.php
@@ -14,6 +14,6 @@ protected function compileClass($expression)
     {
         $expression = is_null($expression) ? '([])' : $expression;
 
-        return "class=\"<?php echo \Illuminate\Support\Arr::toCssClasses{$expression}; ?>\"";
+        return "<?php \$__classes = \Illuminate\Support\Arr::toCssClasses{$expression}; echo \$__classes !== '' ? 'class=\"'.\$__classes.'\"' : ''; ?>";
     }
 }
diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesStyles.php b/src/Illuminate/View/Compilers/Concerns/CompilesStyles.php
index 6c715061ca4a..c77790c0d77f 100644
--- a/src/Illuminate/View/Compilers/Concerns/CompilesStyles.php
+++ b/src/Illuminate/View/Compilers/Concerns/CompilesStyles.php
@@ -14,6 +14,6 @@ protected function compileStyle($expression)
     {
         $expression = is_null($expression) ? '([])' : $expression;
 
-        return "style=\"<?php echo \Illuminate\Support\Arr::toCssStyles{$expression} ?>\"";
+        return "<?php \$__styles = \Illuminate\Support\Arr::toCssStyles{$expression}; echo \$__styles !== '' ? 'style=\"'.\$__styles.'\"' : ''; ?>";
     }
 }
diff --git a/tests/View/Blade/BladeClassTest.php b/tests/View/Blade/BladeClassTest.php
index edf1c9cb8840..142b4a186938 100644
--- a/tests/View/Blade/BladeClassTest.php
+++ b/tests/View/Blade/BladeClassTest.php
@@ -7,8 +7,52 @@ class BladeClassTest extends AbstractBladeTestCase
     public function testClassesAreConditionallyCompiledFromArray()
     {
         $string = "<span @class(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false])></span>";
-        $expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false]); ?>\"></span>";
+        $expected = "<span <?php \$__classes = \Illuminate\Support\Arr::toCssClasses(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false]); echo \$__classes !== '' ? 'class=\"'.\$__classes.'\"' : ''; ?>></span>";
 
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
+
+    public function testClassAttributeIsOmittedWhenArrayIsEmpty()
+    {
+        $template = $this->compiler->compileString('<span @class([])></span>');
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span ></span>', $output);
+    }
+
+    public function testClassAttributeIsOmittedWhenAllConditionsAreFalse()
+    {
+        $template = $this->compiler->compileString("<span @class(['foo' => false, 'bar' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span ></span>', $output);
+    }
+
+    public function testClassAttributeIsRenderedWhenSomeConditionsAreTrue()
+    {
+        $template = $this->compiler->compileString("<span @class(['base', 'active' => true, 'hidden' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span class="base active"></span>', $output);
+    }
+
+    public function testClassAttributeIsRenderedWithUnconditionalClassWhenAllConditionsAreFalse()
+    {
+        $template = $this->compiler->compileString("<span @class(['base', 'active' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span class="base"></span>', $output);
+    }
 }
diff --git a/tests/View/Blade/BladePhpStatementsTest.php b/tests/View/Blade/BladePhpStatementsTest.php
index e0235ece3016..67236423c222 100644
--- a/tests/View/Blade/BladePhpStatementsTest.php
+++ b/tests/View/Blade/BladePhpStatementsTest.php
@@ -122,12 +122,12 @@ public function testStringWithEscapingDataValue()
     public function testUnclosedParenthesisForBladeTags()
     {
         $string = "<span @class(['(']></span>";
-        $expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]); ?>\"(['(']></span>";
+        $expected = "<span <?php \$__classes = \Illuminate\Support\Arr::toCssClasses([]); echo \$__classes !== '' ? 'class=\"'.\$__classes.'\"' : ''; ?>(['(']></span>";
 
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['']></span>";
-        $expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]); ?>\"(['']></span>";
+        $expected = "<span <?php \$__classes = \Illuminate\Support\Arr::toCssClasses([]); echo \$__classes !== '' ? 'class=\"'.\$__classes.'\"' : ''; ?>(['']></span>";
 
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
@@ -145,31 +145,31 @@ public function testUnclosedParenthesisForBladeTags()
     public function testNestedTagCalls()
     {
         $string = "<span @class(['k' => @empty(\$v)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k))' => @empty(\$v)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k))\' => @empty($v)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k))\' => @empty($v)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1), 'r' => @empty(\$v2)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k' => @empty(\$v), 't))' => @empty(\$v1), 'r' => @empty(\$v2)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t))\' => @empty($v1), \'r\' => @empty($v2)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t))\' => @empty($v1), \'r\' => @empty($v2)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
 
         $string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1), 'r' => @empty(\$v2), 'l' => 'l'])></span><span @class(['k' => @empty(\$v)])></span>";
-        $expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2), \'l\' => \'l\']); ?>"></span><span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); ?>"></span>';
+        $expected = '<span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2), \'l\' => \'l\']); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span><span <?php $__classes = \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); echo $__classes !== \'\' ? \'class="\'.$__classes.\'"\' : \'\'; ?>></span>';
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
 
diff --git a/tests/View/Blade/BladeStyleTest.php b/tests/View/Blade/BladeStyleTest.php
index 01e8c2eb14df..5288768ec516 100644
--- a/tests/View/Blade/BladeStyleTest.php
+++ b/tests/View/Blade/BladeStyleTest.php
@@ -7,8 +7,52 @@ class BladeStyleTest extends AbstractBladeTestCase
     public function testStylesAreConditionallyCompiledFromArray()
     {
         $string = "<span @style(['font-weight: bold', 'text-decoration: underline', 'color: red' => true, 'margin-top: 10px' => false])></span>";
-        $expected = "<span style=\"<?php echo \Illuminate\Support\Arr::toCssStyles(['font-weight: bold', 'text-decoration: underline', 'color: red' => true, 'margin-top: 10px' => false]) ?>\"></span>";
+        $expected = "<span <?php \$__styles = \Illuminate\Support\Arr::toCssStyles(['font-weight: bold', 'text-decoration: underline', 'color: red' => true, 'margin-top: 10px' => false]); echo \$__styles !== '' ? 'style=\"'.\$__styles.'\"' : ''; ?>></span>";
 
         $this->assertEquals($expected, $this->compiler->compileString($string));
     }
+
+    public function testStyleAttributeIsOmittedWhenArrayIsEmpty()
+    {
+        $template = $this->compiler->compileString('<span @style([])></span>');
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span ></span>', $output);
+    }
+
+    public function testStyleAttributeIsOmittedWhenAllConditionsAreFalse()
+    {
+        $template = $this->compiler->compileString("<span @style(['color: red' => false, 'margin: 0' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span ></span>', $output);
+    }
+
+    public function testStyleAttributeIsRenderedWhenSomeConditionsAreTrue()
+    {
+        $template = $this->compiler->compileString("<span @style(['font-weight: bold', 'color: red' => true, 'margin: 0' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span style="font-weight: bold; color: red;"></span>', $output);
+    }
+
+    public function testStyleAttributeIsRenderedWithUnconditionalStyleWhenAllConditionsAreFalse()
+    {
+        $template = $this->compiler->compileString("<span @style(['font-weight: bold', 'color: red' => false])></span>");
+
+        ob_start();
+        eval('?>'.$template);
+        $output = ob_get_clean();
+
+        $this->assertSame('<span style="font-weight: bold;"></span>', $output);
+    }
 }