diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index a68901be83a99329af5dddcd7fb141640b31f428..ef071a8a2a8070e0df21fa93f3aa2bc853f06969 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -223,18 +223,10 @@ public class Utils {
         String eLicenseID = Settings.Secure.getString(context.getContentResolver(),
                 Settings.Secure.E_LICENSE_ID);
 
-        String serverUrl = "";
-        if (retrieveStatus(context) != null) {
-            if (retrieveStatus(context).equals("true") && isDevModeOn(context)) {
-                serverUrl = context.getString(R.string.ota_staging_server_url);
-                return serverUrl.replace("{device}", device)
-                        .replace("{type}", type)
-                        .replace("{incr}", incrementalVersion);
-            } else {
-                serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
-            }
-        } else {
-            serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
+        String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
+        if (retrieveStatus(context) != null && retrieveStatus(context).equals("true")
+                && isDevModeOn(context)) {
+            serverUrl = context.getString(R.string.ota_staging_server_url);
         }
 
         if (serverUrl.trim().isEmpty()) {