diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
index 543bb9a976bb38f4679b5929578b40ccf377a97a..a47b158cc97ca53558b1c195eef0c5c5e53be42a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
@@ -27,7 +27,6 @@ import javax.inject.Inject;
 
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.briar.BuildConfig.VERSION_CODE;
 import static org.briarproject.briar.android.BriarApplication.EXPIRY_DATE;
 import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.NO;
 import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.SHOW;
@@ -42,7 +41,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 	private static final Logger LOG =
 			Logger.getLogger(NavDrawerControllerImpl.class.getName());
 	private static final String EXPIRY_DATE_WARNING = "expiryDateWarning";
-	private static final String EXPIRY_DATE_VERSION = "expiryDateVersion";
+	private static final String EXPIRY_SHOW_UPDATE = "expiryShowUpdate";
 
 	private final PluginManager pluginManager;
 	private final SettingsManager settingsManager;
@@ -116,7 +115,8 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 					Settings settings =
 							settingsManager.getSettings(SETTINGS_NAMESPACE);
 					int warningInt = settings.getInt(EXPIRY_DATE_WARNING, 0);
-					int versionCode = settings.getInt(EXPIRY_DATE_VERSION, 0);
+					boolean showUpdate =
+							settings.getBoolean(EXPIRY_SHOW_UPDATE, true);
 
 					if (warningInt == 0) {
 						// we have not warned before
@@ -129,14 +129,16 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 						long daysBeforeExpiry =
 								(EXPIRY_DATE - now) / 1000 / 60 / 60 / 24;
 
-						if (versionCode < 1611) {
+						if (showUpdate) {
 							handler.onResult(UPDATE);
 						} else if (daysSinceLastWarning >= 30) {
 							handler.onResult(SHOW);
 						} else if (daysBeforeExpiry <= 3 &&
 								daysSinceLastWarning > 0) {
 							handler.onResult(SHOW);
-						} else handler.onResult(NO);
+						} else {
+							handler.onResult(NO);
+						}
 					}
 				} catch (DbException e) {
 					if (LOG.isLoggable(WARNING))
@@ -155,7 +157,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 					Settings settings = new Settings();
 					int date = (int) (System.currentTimeMillis() / 1000L);
 					settings.putInt(EXPIRY_DATE_WARNING, date);
-					settings.putInt(EXPIRY_DATE_VERSION, VERSION_CODE);
+					settings.putBoolean(EXPIRY_SHOW_UPDATE, false);
 					settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
 				} catch (DbException e) {
 					if (LOG.isLoggable(WARNING))