diff --git a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassMainHeader.test.tsx.snap b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassMainHeader.test.tsx.snap
index a64dcc96592..fbdb220b595 100644
--- a/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassMainHeader.test.tsx.snap
+++ b/packages/react-core/src/components/Compass/__tests__/__snapshots__/CompassMainHeader.test.tsx.snap
@@ -18,9 +18,7 @@ exports[`Matches the snapshot with both title and toolbar 1`] = `
             Title
           </div>
         </div>
-        <div
-          class=""
-        >
+        <div>
           <div>
             Toolbar
           </div>
diff --git a/packages/react-core/src/components/List/__tests__/__snapshots__/ListItem.test.tsx.snap b/packages/react-core/src/components/List/__tests__/__snapshots__/ListItem.test.tsx.snap
index b4d45faf665..867f8836e2b 100644
--- a/packages/react-core/src/components/List/__tests__/__snapshots__/ListItem.test.tsx.snap
+++ b/packages/react-core/src/components/List/__tests__/__snapshots__/ListItem.test.tsx.snap
@@ -23,9 +23,7 @@ exports[`Matches snapshot with icon 1`] = `
 
 exports[`Matches snapshot without icon 1`] = `
 <DocumentFragment>
-  <li
-    class=""
-  >
+  <li>
     <span>
       List item content
     </span>
diff --git a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
index 9430759a419..cc5d60267ba 100644
--- a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
+++ b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
@@ -1017,7 +1017,6 @@ exports[`Nav Nav List with flyout 1`] = `
       </li>
     </ul>
     <div
-      class=""
       data-popper-escaped="true"
       data-popper-placement="right-start"
       data-popper-reference-hidden="true"
diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
index 142d15d97ee..b552e081bed 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
+++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap
@@ -2,9 +2,7 @@
 
 exports[`SearchInput advanced search 1`] = `
 <DocumentFragment>
-  <div
-    class=""
-  >
+  <div>
     <div
       class="pf-v6-c-input-group"
     >
@@ -145,7 +143,6 @@ exports[`SearchInput advanced search 1`] = `
 exports[`SearchInput advanced search with custom attributes 1`] = `
 <DocumentFragment>
   <div
-    class=""
     data-testid="test-id"
   >
     <div
@@ -282,7 +279,6 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
       </div>
     </div>
     <div
-      class=""
       data-popper-escaped="true"
       data-popper-placement="bottom-start"
       data-popper-reference-hidden="true"
@@ -478,9 +474,7 @@ exports[`SearchInput advanced search with custom attributes 1`] = `
 
 exports[`SearchInput renders search input in strict mode 1`] = `
 <DocumentFragment>
-  <div
-    class=""
-  >
+  <div>
     <div
       class="pf-v6-c-input-group"
     >
diff --git a/packages/react-core/src/components/ToggleGroup/__tests__/__snapshots__/ToggleGroupItemElement.test.tsx.snap b/packages/react-core/src/components/ToggleGroup/__tests__/__snapshots__/ToggleGroupItemElement.test.tsx.snap
index 215ede9c9e1..95537ec6bb2 100644
--- a/packages/react-core/src/components/ToggleGroup/__tests__/__snapshots__/ToggleGroupItemElement.test.tsx.snap
+++ b/packages/react-core/src/components/ToggleGroup/__tests__/__snapshots__/ToggleGroupItemElement.test.tsx.snap
@@ -2,9 +2,7 @@
 
 exports[`empty 1`] = `
 <DocumentFragment>
-  <span
-    class=""
-  />
+  <span />
 </DocumentFragment>
 `;
 
diff --git a/packages/react-core/src/layouts/Flex/__tests__/__snapshots__/Flex.test.tsx.snap b/packages/react-core/src/layouts/Flex/__tests__/__snapshots__/Flex.test.tsx.snap
index 976da115445..3a903ff4ce5 100644
--- a/packages/react-core/src/layouts/Flex/__tests__/__snapshots__/Flex.test.tsx.snap
+++ b/packages/react-core/src/layouts/Flex/__tests__/__snapshots__/Flex.test.tsx.snap
@@ -8,9 +8,7 @@ exports[`Flex Nested flex 1`] = `
     <div
       class="pf-v6-l-flex"
     >
-      <div
-        class=""
-      >
+      <div>
         Test
       </div>
     </div>
@@ -23,9 +21,7 @@ exports[`Flex Simple flex with single item 1`] = `
   <div
     class="pf-v6-l-flex"
   >
-    <div
-      class=""
-    >
+    <div>
       Test
     </div>
   </div>
@@ -37,9 +33,7 @@ exports[`Flex alternative component 1`] = `
   <ul
     class="pf-v6-l-flex"
   >
-    <li
-      class=""
-    >
+    <li>
       Test
     </li>
   </ul>
diff --git a/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap b/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
index f1ccc6d027b..9597af1a18b 100644
--- a/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
+++ b/packages/react-drag-drop/src/components/DragDrop/__tests__/__snapshots__/DragDrop.test.tsx.snap
@@ -6,9 +6,7 @@ exports[`renders some divs 1`] = `
     class="pf-c-droppable pf-m-dragging"
   >
     <div>
-      <div
-        class=""
-      >
+      <div>
         <button
           aria-describedby="DndDescribedBy-0"
           aria-disabled="false"
@@ -46,9 +44,7 @@ exports[`renders some divs 1`] = `
         </button>
         one
       </div>
-      <div
-        class=""
-      >
+      <div>
         <button
           aria-describedby="DndDescribedBy-0"
           aria-disabled="false"
@@ -86,9 +82,7 @@ exports[`renders some divs 1`] = `
         </button>
         two
       </div>
-      <div
-        class=""
-      >
+      <div>
         <button
           aria-describedby="DndDescribedBy-0"
           aria-disabled="false"
diff --git a/packages/react-styles/src/index.ts b/packages/react-styles/src/index.ts
index 5ef30ebf683..20ddc46a080 100644
--- a/packages/react-styles/src/index.ts
+++ b/packages/react-styles/src/index.ts
@@ -2,8 +2,8 @@
  *
  * @param {any} args list of objects, string, or arrays to reduce
  */
-export function css(...args: any): string {
-  // Adapted from https://github.com/JedWatson/classnames/blob/master/index.js
+export function css(...args: any): string | undefined {
+  // Adapted from https://github.com/JedWatson/classnames/blob/main/index.js
   const classes = [] as string[];
   const hasOwn = {}.hasOwnProperty;
 
@@ -26,5 +26,5 @@ export function css(...args: any): string {
     }
   });
 
-  return classes.join(' ');
+  return classes.join(' ') || undefined;
 }