diff --git a/src/Plugin/Map/OLMap/js/olmap.js b/src/Plugin/Map/OLMap/js/olmap.js
index a108079..ef3ed17 100644
--- a/src/Plugin/Map/OLMap/js/olmap.js
+++ b/src/Plugin/Map/OLMap/js/olmap.js
@@ -43,7 +43,7 @@ Drupal.openlayers.pluginManager.register({
     return new ol.Map(options);
   },
   detach: function (context, settings) {
-    jQuery('.openlayers-map').removeOnce('openlayers-map', function () {
+    jQuery('.openlayers-map', context).removeOnce('openlayers-map', function () {
       var map_id = jQuery(this).attr('id');
       delete Drupal.openlayers.instances[map_id];
     });