diff --git a/packages/uniwind/src/hoc/withUniwind.tsx b/packages/uniwind/src/hoc/withUniwind.tsx
index 29d78435..b2a294ce 100644
--- a/packages/uniwind/src/hoc/withUniwind.tsx
+++ b/packages/uniwind/src/hoc/withUniwind.tsx
@@ -81,11 +81,16 @@ const withAutoUniwind = (Component: Component<AnyObject>) => (originalProps: Any
         return dispose
     }, [classNames])
 
+    const dataSet = generateDataSet(props)
+
+    if (dataSet) {
+        generatedProps.dataSet = dataSet
+    }
+
     return (
         <Component
             {...props}
             {...generatedProps}
-            dataSet={generateDataSet(props)}
         />
     )
 }
@@ -133,11 +138,16 @@ const withManualUniwind = (Component: Component<AnyObject>, options: Record<Prop
         return dispose
     }, [classNames])
 
+    const dataSet = generateDataSet(props)
+
+    if (dataSet) {
+        generatedProps.dataSet = dataSet
+    }
+
     return (
         <Component
             {...props}
             {...generatedProps}
-            dataSet={generateDataSet(props)}
         />
     )
 }