diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c3702355..6f295a40f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -393,8 +393,8 @@
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-
                 <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
index f5e916486..f445c23da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
@@ -30,8 +30,12 @@ public class AutoStartReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (GBApplication.getGBPrefs().getAutoStart() && Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-            Log.i(TAG, "Boot completed, starting Gadgetbridge");
+
+        if (GBApplication.getGBPrefs().getAutoStart() &&
+                (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction()) ||
+                        Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())
+                )) {
+            Log.i(TAG, "Boot or reinstall completed, starting Gadgetbridge");
             if (GBApplication.getPrefs().getBoolean("general_autoconnectonbluetooth", false)) {
                 Log.i(TAG, "Autoconnect is enabled, attempting to connect");
                 GBApplication.deviceService().connect();