diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1beefdda24..447a90c623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Mapbox welcomes participation and contributions from everyone.
 * Deliver style to the plugin registry on map start if a new one was loaded after map stop. ([1558](https://github.com/mapbox/mapbox-maps-android/pull/1558))
 * Fix a bug in cameraForGeometry returning incorrect camera options when pitch > 0. ([1568](https://github.com/mapbox/mapbox-maps-android/pull/1568))
 * Fix Android memory leak when destroying platform view annotation manager. ([1568](https://github.com/mapbox/mapbox-maps-android/pull/1568))
+* Fix style getters for terrain, light and atmosphere resetting properties. ([1573](https://github.com/mapbox/mapbox-maps-android/pull/1573))
 
 ## Dependencies
 Bump gl-native to v10.8.0-beta.1, common to v23.0.0-beta.1. ([1568](https://github.com/mapbox/mapbox-maps-android/pull/1568))
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/Atmosphere.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/Atmosphere.kt
index c3981bda35..a41373183f 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/Atmosphere.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/Atmosphere.kt
@@ -24,7 +24,7 @@ import com.mapbox.maps.extension.style.utils.unwrap
  */
 @UiThread
 class Atmosphere : AtmosphereDslReceiver, StyleContract.StyleAtmosphereExtension {
-  private var delegate: StyleInterface? = null
+  internal var delegate: StyleInterface? = null
   private val properties = HashMap<String, PropertyValue<*>>()
 
   /**
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereExt.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereExt.kt
index fee81f934a..8d8e0c21fa 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereExt.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereExt.kt
@@ -12,7 +12,7 @@ import com.mapbox.maps.extension.style.StyleInterface
  * @return Atmosphere
  */
 fun StyleInterface.getAtmosphere(): Atmosphere {
-  return Atmosphere().also { it.bindTo(this) }
+  return Atmosphere().also { it.delegate = this }
 }
 
 /**
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/Light.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/Light.kt
index 03b467d02c..8dea078e23 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/Light.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/Light.kt
@@ -29,7 +29,7 @@ import kotlin.collections.HashMap
  */
 @UiThread
 class Light : LightDslReceiver, StyleContract.StyleLightExtension {
-  private var delegate: StyleInterface? = null
+  internal var delegate: StyleInterface? = null
   private val properties = HashMap<String, PropertyValue<*>>()
 
   /**
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/LightExt.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/LightExt.kt
index d1cb28fe81..2f680f6f09 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/LightExt.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/light/generated/LightExt.kt
@@ -12,7 +12,7 @@ import com.mapbox.maps.extension.style.StyleInterface
  * @return Light
  */
 fun StyleInterface.getLight(): Light {
-  return Light().also { it.bindTo(this) }
+  return Light().also { it.delegate = this }
 }
 
 /**
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/Terrain.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/Terrain.kt
index 40e9898540..306848c613 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/Terrain.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/Terrain.kt
@@ -20,7 +20,7 @@ import com.mapbox.maps.extension.style.utils.unwrap
  */
 @UiThread
 class Terrain(private val sourceId: String) : TerrainDslReceiver, StyleContract.StyleTerrainExtension {
-  private var delegate: StyleInterface? = null
+  internal var delegate: StyleInterface? = null
   private val properties = HashMap<String, PropertyValue<*>>()
 
   /**
diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/TerrainExt.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/TerrainExt.kt
index daccb0b1b7..6bc4d3ee44 100644
--- a/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/TerrainExt.kt
+++ b/extension-style/src/main/java/com/mapbox/maps/extension/style/terrain/generated/TerrainExt.kt
@@ -13,7 +13,7 @@ import com.mapbox.maps.extension.style.StyleInterface
  * @return Terrain
  */
 fun StyleInterface.getTerrain(sourceId: String): Terrain {
-  return Terrain(sourceId).also { it.bindTo(this) }
+  return Terrain(sourceId).also { it.delegate = this }
 }
 
 /**
diff --git a/extension-style/src/test/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereTest.kt b/extension-style/src/test/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereTest.kt
index cec71fc16d..aa760c02ee 100644
--- a/extension-style/src/test/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereTest.kt
+++ b/extension-style/src/test/java/com/mapbox/maps/extension/style/atmosphere/generated/AtmosphereTest.kt
@@ -923,7 +923,7 @@ class AtmosphereTest {
   @Test
   fun getAtmosphereTest() {
     assertNotNull(style.getAtmosphere())
-    verify { style.setStyleAtmosphere(any()) }
+    verify(exactly = 0) { style.setStyleAtmosphere(any()) }
   }
 }
 
diff --git a/extension-style/src/test/java/com/mapbox/maps/extension/style/light/generated/LightTest.kt b/extension-style/src/test/java/com/mapbox/maps/extension/style/light/generated/LightTest.kt
index 178c6adad0..4f30dea678 100644
--- a/extension-style/src/test/java/com/mapbox/maps/extension/style/light/generated/LightTest.kt
+++ b/extension-style/src/test/java/com/mapbox/maps/extension/style/light/generated/LightTest.kt
@@ -716,7 +716,7 @@ class LightTest {
   @Test
   fun getLightTest() {
     assertNotNull(style.getLight())
-    verify { style.setStyleLight(any()) }
+    verify(exactly = 0) { style.setStyleLight(any()) }
   }
 }
 
diff --git a/extension-style/src/test/java/com/mapbox/maps/extension/style/terrain/generated/TerrainTest.kt b/extension-style/src/test/java/com/mapbox/maps/extension/style/terrain/generated/TerrainTest.kt
index f976efb06e..2e47b12f6d 100644
--- a/extension-style/src/test/java/com/mapbox/maps/extension/style/terrain/generated/TerrainTest.kt
+++ b/extension-style/src/test/java/com/mapbox/maps/extension/style/terrain/generated/TerrainTest.kt
@@ -171,7 +171,7 @@ class TerrainTest {
   @Test
   fun getTerrainTest() {
     assertNotNull(style.getTerrain(sourceId))
-    verify { style.setStyleTerrain(any()) }
+    verify(exactly = 0) { style.setStyleTerrain(any()) }
   }
 
   @Test