diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/BoundingBox/ParamBoundingBoxSize.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/BoundingBox/ParamBoundingBoxSize.tsx
index 4c2e6d252c..7725461fd3 100644
--- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/BoundingBox/ParamBoundingBoxSize.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Canvas/BoundingBox/ParamBoundingBoxSize.tsx
@@ -80,7 +80,16 @@ export default function ParamBoundingBoxSize() {
           size="sm"
           icon={<MdOutlineSwapVert />}
           fontSize={20}
-          onClick={() => dispatch(flipBoundingBoxAxes())}
+          onClick={() => {
+            dispatch(flipBoundingBoxAxes());
+            if (
+              ![null, 2 / 3, 16 / 9, 1 / 1].includes(
+                boundingBoxDimensions.height / boundingBoxDimensions.width
+              )
+            ) {
+              dispatch(setAspectRatio(null));
+            }
+          }}
         />
         <IAIIconButton
           tooltip={t('ui.lockRatio')}
diff --git a/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts b/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
index 4ffd5ca565..c7b8d2b41f 100644
--- a/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
+++ b/invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
@@ -5,7 +5,6 @@ import { configChanged } from 'features/system/store/configSlice';
 import { clamp } from 'lodash-es';
 import { ImageDTO } from 'services/api/types';
 
-import { flipBoundingBoxAxes } from 'features/canvas/store/canvasSlice';
 import { clipSkipMap } from '../types/constants';
 import {
   CfgScaleParam,
@@ -312,9 +311,6 @@ export const generationSlice = createSlice({
         state.clipSkip = 0;
       }
     });
-    builder.addCase(flipBoundingBoxAxes, (state) => {
-      state.aspectRatio = null;
-    });
   },
 });