diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index 77c6b6cb0..0a218d061 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -99,6 +99,11 @@ public class App extends Application {
         ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        if (BuildConfig.FLAVOR.equals("github")) {
+            new FetchAppVersionTask().execute();
+        }
     }
 
     protected Downloader getDownloader() {
diff --git a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
index 75da96096..d56e07127 100644
--- a/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/FetchAppVersionTask.java
@@ -124,6 +124,7 @@ public class FetchAppVersionTask extends AsyncTask<Void, Void, String> {
 
             Application app = App.getContext();
 
+            // A pending intent to open the apk location url in the browser.
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
             PendingIntent pendingIntent
                     = PendingIntent.getActivity(app, 0, intent, 0);
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 1554dddc0..0ce6772bb 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -80,10 +80,6 @@ public class MainActivity extends AppCompatActivity {
 
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
-        if (BuildConfig.FLAVOR.equals("github")) {
-            new FetchAppVersionTask().execute();
-        }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);