diff --git a/app/src/main/java/org/traccar/client/TrackingController.java b/app/src/main/java/org/traccar/client/TrackingController.java
index 1861b78..9061679 100644
--- a/app/src/main/java/org/traccar/client/TrackingController.java
+++ b/app/src/main/java/org/traccar/client/TrackingController.java
@@ -45,21 +45,25 @@ public class TrackingController implements PositionProvider.PositionListener {
 
     @Override
     public void onPositionUpdate(Position position) {
-        String request = ProtocolFormatter.formatRequest(
-                preferences.getString(MainActivity.KEY_ADDRESS, null),
-                Integer.parseInt(preferences.getString(MainActivity.KEY_INTERVAL, null)),
-                position.getId(), position.location, position.getBattery());
+        if (position != null) {
+            StatusActivity.addMessage(context.getString(R.string.status_location_update));
 
-        RequestManager.sendRequest(request, new RequestManager.RequestHandler() {
-            @Override
-            public void onSuccess() {
-            }
+            String request = ProtocolFormatter.formatRequest(
+                    preferences.getString(MainActivity.KEY_ADDRESS, null),
+                    Integer.parseInt(preferences.getString(MainActivity.KEY_PORT, null)),
+                    position.getId(), position.location, position.getBattery());
 
-            @Override
-            public void onFailure() {
-                StatusActivity.addMessage(context.getString(R.string.status_send_fail));
-            }
-        });
+            RequestManager.sendRequest(request, new RequestManager.RequestHandler() {
+                @Override
+                public void onSuccess() {
+                }
+
+                @Override
+                public void onFailure() {
+                    StatusActivity.addMessage(context.getString(R.string.status_send_fail));
+                }
+            });
+        }
     }
 
 }
diff --git a/app/src/main/res/xml-v14/preferences.xml b/app/src/main/res/xml-v14/preferences.xml
index e0a5816..d0d146a 100644
--- a/app/src/main/res/xml-v14/preferences.xml
+++ b/app/src/main/res/xml-v14/preferences.xml
@@ -21,7 +21,7 @@
         android:title="@string/settings_address_title" />
 
     <EditTextPreference
-        android:defaultValue="5005"
+        android:defaultValue="5055"
         android:key="port"
         android:numeric="integer"
         android:summary="@string/settings_port_summary"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 30c8ec5..9f23f50 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -19,7 +19,7 @@
         android:title="@string/settings_address_title" />
 
     <EditTextPreference
-        android:defaultValue="5005"
+        android:defaultValue="5055"
         android:key="port"
         android:numeric="integer"
         android:summary="@string/settings_port_summary"