diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java b/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
index 4fac42a0fb2b683f9c85dd3152c0423bec9ef9e4..f1f8e4dec3ee998546590a0d45434bdc8747eb35 100644
--- a/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
+++ b/mobile/src/main/java/org/openhab/habdroid/ui/PreferencesActivity.java
@@ -229,7 +229,6 @@ public class PreferencesActivity extends AppCompatActivity {
 
             final Preference localConnPref = findPreference(Constants.SUBSCREEN_LOCAL_CONNECTION);
             final Preference remoteConnPref = findPreference(Constants.SUBSCREEN_REMOTE_CONNECTION);
-            final Preference openlichtConnPref = findPreference(Constants.PREFERENCE_OPENLICHT_URL);
             final Preference themePref = findPreference(Constants.PREFERENCE_THEME);
             final Preference clearCachePref = findPreference(Constants.PREFERENCE_CLEAR_CACHE);
             final Preference clearDefaultSitemapPref =
diff --git a/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java b/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
index 581fe0ccaffd9b382a11f885a493ad0b3bbd1d34..1c73dc79522aba07ade1a62f1b12405c188cb33c 100644
--- a/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
+++ b/mobile/src/main/java/org/openhab/habdroid/util/RetrofitClientInstance.java
@@ -2,14 +2,10 @@ package org.openhab.habdroid.util;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
-
-import static android.content.Context.MODE_PRIVATE;
-
 /*
  *  OpenLicht
  *  Use Retrofit to call the API
@@ -20,14 +16,13 @@ public class RetrofitClientInstance {
 
     private static Retrofit retrofit;
 
-//    private static final String BASE_URL = "http://10.0.2.2:5000";
 
     public static Retrofit getRetrofitInstance(Activity activity) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        String openlichtUrl = preferences.getString("default_openlicht_url", null);
+        String url = preferences.getString(Constants.PREFERENCE_OPENLICHT_URL, "");
         if (retrofit == null) {
             retrofit = new Retrofit.Builder()
-                    .baseUrl(openlichtUrl)
+                    .baseUrl(url)
                     .addConverterFactory(GsonConverterFactory.create())
                     .build();
         }
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 154be6084ef6addb5034073ee2798433ec75f48d..3be9fd1f0b6660c85c4e3136f32e533cd64593f8 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="settings_current_default_sitemap">Current default Sitemap: %1$s</string>
     <string name="settings_openhab_alt_connection">Remote</string>
     <string name="settings_openhab_connection">Local</string>
-    <string name="settings_openlicht_connection">Openlicht</string>
+    <string name="settings_openlicht_connection">OpenLicht REST URL</string>
     <string name="settings_notification_vibration">Notification vibration</string>
     <string name="settings_notification_vibration_off">Off</string>
     <string name="settings_notification_vibration_short">Short</string>
diff --git a/mobile/src/main/res/xml/openlicht_connection_preferences.xml b/mobile/src/main/res/xml/openlicht_connection_preferences.xml
deleted file mode 100644
index 485e371ffd5787c6c10a4d21d5b6d0fae1e4bc50..0000000000000000000000000000000000000000
--- a/mobile/src/main/res/xml/openlicht_connection_preferences.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_openhab_alt_connection">
-    <org.openhab.habdroid.ui.widget.UrlInputPreference
-        android:defaultValue="@string/empty_string"
-        android:inputType="textNoSuggestions"
-        android:key="default_openhab_alturl"
-        android:summary="@string/settings_openhab_alturl_summary"
-        android:title="@string/settings_openhab_alturl"
-        android:icon="@drawable/ic_earth_grey_24dp" />
-</PreferenceScreen>
\ No newline at end of file