diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7b577f93..c6258d08 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,7 +116,7 @@ module ApplicationHelper
   end
 
   def speed_text_color(speed)
-    return if speed.to_i >= 0
+    return 'text-default' if speed.to_i >= 0
 
     'text-red-500'
   end
diff --git a/app/javascript/controllers/maps_controller.js b/app/javascript/controllers/maps_controller.js
index 05f78221..d0bb046d 100644
--- a/app/javascript/controllers/maps_controller.js
+++ b/app/javascript/controllers/maps_controller.js
@@ -174,6 +174,9 @@ export default class extends Controller {
   }
 
   disconnect() {
+    if (this.handleDeleteClick) {
+      document.removeEventListener('click', this.handleDeleteClick);
+    }
     this.map.remove();
   }
 
@@ -331,11 +334,10 @@ export default class extends Controller {
           }
         }
       };
-    }
 
-    // Add the listener only if it hasn't been added before
-    document.removeEventListener('click', this.handleDeleteClick);
-    document.addEventListener('click', this.handleDeleteClick);
+      // Add the listener only if it hasn't been added before
+      document.addEventListener('click', this.handleDeleteClick);
+    }
 
     // Add an event listener for base layer change in Leaflet
     this.map.on('baselayerchange', (event) => {