diff --git a/packages/core/src/view/geometry/Shape.ts b/packages/core/src/view/geometry/Shape.ts
index 895ca911e5..2b518e4bc9 100644
--- a/packages/core/src/view/geometry/Shape.ts
+++ b/packages/core/src/view/geometry/Shape.ts
@@ -86,7 +86,10 @@ import { StyleDefaultsConfig } from '../../util/config';
  * ```
  */
 class Shape {
-  // Assigned in mxCellRenderer
+  /**
+   * Switch to preserve image aspect.
+   * @default false
+   */
   preserveImageAspect = false;
   overlay: CellOverlay | null = null;
   indicator: Shape | null = null;
diff --git a/packages/core/src/view/geometry/node/ImageShape.ts b/packages/core/src/view/geometry/node/ImageShape.ts
index f1ed3b2fef..68ff57b72f 100644
--- a/packages/core/src/view/geometry/node/ImageShape.ts
+++ b/packages/core/src/view/geometry/node/ImageShape.ts
@@ -20,7 +20,6 @@ import RectangleShape from './RectangleShape';
 import type Rectangle from '../Rectangle';
 import CellState from '../../cell/CellState';
 import type AbstractCanvas2D from '../../canvas/AbstractCanvas2D';
-import CellOverlay from '../../cell/CellOverlay';
 import { NONE } from '../../../util/Constants';
 import { ColorValue } from '../../../types';
 
@@ -42,23 +41,12 @@ class ImageShape extends RectangleShape {
 
     this.imageSrc = imageSrc;
     this.shadow = false;
+    this.preserveImageAspect = true;
   }
 
   // TODO: Document me!!
   shadow: boolean;
 
-  imageSrc: string;
-
-  // Used in mxCellRenderer
-  overlay: CellOverlay | null = null;
-
-  /**
-   * Switch to preserve image aspect. Default is true.
-   * @default true
-   */
-  // preserveImageAspect: boolean;
-  preserveImageAspect = true;
-
   /**
    * Disables offset in IE9 for crisper image output.
    */