diff --git a/packages/nimble-components/src/wafer-map/modules/experimental/hover-handler.ts b/packages/nimble-components/src/wafer-map/modules/experimental/hover-handler.ts
index 833f1fe6f3..b3da77e01f 100644
--- a/packages/nimble-components/src/wafer-map/modules/experimental/hover-handler.ts
+++ b/packages/nimble-components/src/wafer-map/modules/experimental/hover-handler.ts
@@ -76,7 +76,10 @@ export class HoverHandler {
     private calculateDieCoordinates(
         mousePosition: PointCoordinates
     ): PointCoordinates | undefined {
-        if (this.wafermap.dataManager instanceof DataManager) {
+        if (
+            this.wafermap.isExperimentalRenderer()
+            && this.wafermap.dataManager instanceof DataManager
+        ) {
             const originLocation = this.wafermap.originLocation;
             const xRoundFunction = originLocation === WaferMapOriginLocation.bottomLeft
                 || originLocation === WaferMapOriginLocation.topLeft
diff --git a/packages/nimble-components/src/wafer-map/modules/hover-handler.ts b/packages/nimble-components/src/wafer-map/modules/hover-handler.ts
index 193e03060c..da3b5dc336 100644
--- a/packages/nimble-components/src/wafer-map/modules/hover-handler.ts
+++ b/packages/nimble-components/src/wafer-map/modules/hover-handler.ts
@@ -62,7 +62,10 @@ export class HoverHandler {
     private calculateDieCoordinates(
         mousePosition: PointCoordinates
     ): PointCoordinates | undefined {
-        if (this.wafermap.dataManager instanceof DataManager) {
+        if (
+            !this.wafermap.isExperimentalRenderer()
+            && this.wafermap.dataManager instanceof DataManager
+        ) {
             const originLocation = this.wafermap.originLocation;
             const xRoundFunction = originLocation === WaferMapOriginLocation.bottomLeft
                 || originLocation === WaferMapOriginLocation.topLeft