diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js
index debf39a05c..06f50a7c4a 100644
--- a/src/ol/Overlay.js
+++ b/src/ol/Overlay.js
@@ -249,14 +249,14 @@ class Overlay extends BaseObject {
 
   /**
    * Get the map associated with this overlay.
-   * @return {import("./PluggableMap.js").default|undefined} The map that the
+   * @return {import("./PluggableMap.js").default|null} The map that the
    * overlay is part of.
    * @observable
    * @api
    */
   getMap() {
-    return /** @type {import("./PluggableMap.js").default|undefined} */ (
-      this.get(Property.MAP)
+    return /** @type {import("./PluggableMap.js").default|null} */ (
+      this.get(Property.MAP) || null
     );
   }
 
@@ -378,7 +378,7 @@ class Overlay extends BaseObject {
 
   /**
    * Set the map to be associated with this overlay.
-   * @param {import("./PluggableMap.js").default|undefined|null} map The map that the
+   * @param {import("./PluggableMap.js").default|null} map The map that the
    * overlay is part of. Pass `null` to just remove the overlay from the current map.
    * @observable
    * @api
diff --git a/src/ol/control/Control.js b/src/ol/control/Control.js
index d526b2056f..2dde885ae8 100644
--- a/src/ol/control/Control.js
+++ b/src/ol/control/Control.js
@@ -69,7 +69,7 @@ class Control extends BaseObject {
 
     /**
      * @private
-     * @type {import("../PluggableMap.js").default|undefined|null}
+     * @type {import("../PluggableMap.js").default|null}
      */
     this.map_ = null;
 
@@ -98,7 +98,7 @@ class Control extends BaseObject {
 
   /**
    * Get the map associated with this control.
-   * @return {import("../PluggableMap.js").default|undefined|null} Map.
+   * @return {import("../PluggableMap.js").default|null} Map.
    * @api
    */
   getMap() {
@@ -110,7 +110,7 @@ class Control extends BaseObject {
    * Pass `null` to just remove the control from the current map.
    * Subclasses may set up event handlers to get notified about changes to
    * the map here.
-   * @param {import("../PluggableMap.js").default|null} [map] Map.
+   * @param {import("../PluggableMap.js").default|null} map Map.
    * @api
    */
   setMap(map) {