diff --git a/sdk/src/main/java/com/mapbox/maps/MapController.kt b/sdk/src/main/java/com/mapbox/maps/MapController.kt
index bde5854ff7..cfa2e59479 100644
--- a/sdk/src/main/java/com/mapbox/maps/MapController.kt
+++ b/sdk/src/main/java/com/mapbox/maps/MapController.kt
@@ -228,8 +228,8 @@ internal class MapController : MapPluginProviderDelegate, MapControllable {
 
   override fun removeWidget(widget: Widget): Boolean {
     val wasRemoved = renderer.renderThread.removeWidget(widget)
-    widget.setRepaintTrigger(null)
     if (wasRemoved) {
+      widget.setRepaintTrigger(null)
       renderer.scheduleRepaint()
     }
     return wasRemoved
diff --git a/sdk/src/main/java/com/mapbox/maps/renderer/widget/Widget.kt b/sdk/src/main/java/com/mapbox/maps/renderer/widget/Widget.kt
index 5dfbd314da..a2232e7bf0 100644
--- a/sdk/src/main/java/com/mapbox/maps/renderer/widget/Widget.kt
+++ b/sdk/src/main/java/com/mapbox/maps/renderer/widget/Widget.kt
@@ -51,7 +51,7 @@ abstract class Widget internal constructor() {
   abstract fun getRotation(): Float
 
   @JvmSynthetic
-  internal fun setRepaintTrigger(trigger: (() -> Unit)?) {
-    repaintTrigger = trigger
+  internal fun setRepaintTrigger(doOnRepaint: (() -> Unit)?) {
+    repaintTrigger = doOnRepaint
   }
 }
\ No newline at end of file