diff --git a/app/src/interfaces/map/map.vue b/app/src/interfaces/map/map.vue
index 837932b462..6dbf8f058a 100644
--- a/app/src/interfaces/map/map.vue
+++ b/app/src/interfaces/map/map.vue
@@ -239,6 +239,16 @@ export default defineComponent({
 					loadValueFromProps();
 				}
 			);
+
+			watch(
+				() => props.disabled,
+				() => {
+					map.removeControl(controls.draw);
+					controls.draw = new MapboxDraw(getDrawOptions(geometryType));
+					map.addControl(controls.draw as IControl, 'top-left');
+					loadValueFromProps();
+				}
+			);
 		}
 
 		function resetValue(hard: boolean) {