diff --git a/changelog.md b/changelog.md
index 765c7f5b73..96e5474a03 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,7 @@
 # 5.*.* - **.**.2024
 
 **What's New**
+* [FlexRow][Breaking Change]: Only for `@epam/loveship` package. Now spacing default value works based on `columnGap` props. It shouldn't affect general cases, but previous spacing implementation require additional hack when it was needed to add negative margin value for container to remove corner paddings in multiline case. Now this hack should be removed, since `columnGap` implementation doesn't produce such bug for multiline.
 * [Button]: added size `60` to props
 * [MultiSwitch]: added size `60` to props
 * [TabButton][VerticalTabButton]: decreased paddings, added gaps `3px` between internal items for all sizes according to design
diff --git a/loveship/components/layout/FlexItems/FlexRow.tsx b/loveship/components/layout/FlexItems/FlexRow.tsx
index 4070f36776..80788ff0dd 100644
--- a/loveship/components/layout/FlexItems/FlexRow.tsx
+++ b/loveship/components/layout/FlexItems/FlexRow.tsx
@@ -23,7 +23,7 @@ const commonDefaults: FlexRowProps = {
 const rowTypesDefaults: Record<string, FlexRowProps> = {
     form: {
         ...commonDefaults,
-        spacing: '12',
+        columnGap: '12',
         alignItems: 'top',
         vPadding: '18',
         padding: '24',
@@ -31,7 +31,7 @@ const rowTypesDefaults: Record<string, FlexRowProps> = {
     panel: {
         ...commonDefaults,
         alignItems: 'center',
-        spacing: '6',
+        columnGap: '6',
         size: '36',
     },
 };