diff --git a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
index 1352eee..dad2634 100644
--- a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
+++ b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
@@ -664,18 +664,22 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        MyLocation loc = serviceXmpp.getCurrentLocation();
-                        onNewLocation(loc);
+                        if (serviceGps.isTraceurActivated()) {
+                            MyLocation loc = serviceXmpp.getCurrentLocation();
+                            onNewLocation(loc);
+                        }
                     }
                 });
             } else if (o.equals(ServiceXmpp.NOTIF_NEW_OBJECT)){
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        MyLocation locObj = serviceXmpp.getLastObjectXmppLocation();
-                        WayPointLocation loc = serviceGps.addPointObjectTrail(locObj);
-                        GeoPoint gp = new GeoPoint(loc.getLatitude(), loc.getLongitude(), loc.getAltitude());
-                        addMarker(gp, loc.isFound());
+                        if (serviceGps.isTraceurActivated()) {
+                            MyLocation locObj = serviceXmpp.getLastObjectXmppLocation();
+                            WayPointLocation loc = serviceGps.addPointObjectTrail(locObj);
+                            GeoPoint gp = new GeoPoint(loc.getLatitude(), loc.getLongitude(), loc.getAltitude());
+                            addMarker(gp, loc.isFound());
+                        }
                     }
                 });
             } else if (o.equals(ServiceXmpp.NOTIF_START_TRAIL)){