diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index b4c0b9c..7eca458 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -403,7 +403,16 @@ public class MapActivity extends BaseActivity
                                             coordsMap.put(id, element);
                                             marker.setPosition(toDestination);
 
+                                        } else if((System.currentTimeMillis() - coordinate.getTimeStamp()) > (long) 300000) {
+                                            // TODO debug logic and remove timestamp removing
+//                                            String id = coordinate.getUserId();
+                                            Marker markerToRemove = markerHash.get(id);
+                                            markerHash.remove(id);
+                                            coordsMap.remove(id);
+                                            mapboxMap.removeMarker(markerToRemove);
+                                            currentCoordsIds.remove(id);
                                         }
+
                                     } else {
                                         Log.e(tag, "Marker Added: " + id);