diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
index fa11688f47..0c4b45477a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
@@ -80,6 +80,9 @@ public class UpdateActivity extends BaseAppCompatActivity {
     private static String CHECKSUM = "";
 
     public static void checkForAnUpdate(final Context context) {
+        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
+        StackTraceElement stack = stacktrace[3];
+        String callingMethodName = stack.getMethodName(); // Name of the method that has called this one
         if (prefs == null) prefs = PreferenceManager.getDefaultSharedPreferences(context);
         if ((last_check_time != -1) && (!prefs.getBoolean(AUTO_UPDATE_PREFS_NAME, true))) return;
         if (last_check_time == 0)
@@ -169,6 +172,9 @@ public static void checkForAnUpdate(final Context context) {
                                     }
                                 } else {
                                     Log.i(TAG, "Our current version is the most recent: " + versionnumber + " vs " + newversion);
+                                    if ((callingMethodName).equals("checkForUpdate")) {
+                                        JoH.static_toast_long(xdrip.gs(R.string.current_version_is_up_to_date)); // Only for manual update check
+                                    }
                                 }
                             } catch (Exception e) {
                                 Log.e(TAG, "Got exception parsing update version: " + e.toString());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d8d21bbac..c1735b6499 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,6 +195,7 @@
     <string name="libre_last_x_minutes_graph">Libre last %d minutes graph</string>
     <string name="share_config_via_qr_code">Share config via QR code</string>
     <string name="check_for_updated_version">Check for updated version</string>
+    <string name="current_version_is_up_to_date">No update in the selected channel</string>
     <string name="send_feedback_to_developer">Send Feedback to developers</string>
     <string name="home_screen">Home Screen</string>
     <string name="event_logs">Event Logs</string>