diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 732055ca..30411a94 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -29,9 +29,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Remove self-update permission for F-Droid build
+      - name: Prepare F-Droid build (no self-update)
         run: |
           sed -i '/android.permission.REQUEST_INSTALL_PACKAGES/d' app/src/main/AndroidManifest.xml
+          sed -i 's/buildConfigField "boolean", "IS_FDROID_BUILD", "false"/buildConfigField "boolean", "IS_FDROID_BUILD", "true"/' app/build.gradle
 
       - name: Build APK
         run: ./gradlew assembleRelease --stacktrace
diff --git a/app/build.gradle b/app/build.gradle
index d925f0ac..860e2fdb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,8 @@ android {
         versionCode 184
         versionName "6.0.0-pre1"
 
+        buildConfigField "boolean", "IS_FDROID_BUILD", "false"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt b/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
index 25049826..d14c9b02 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
@@ -132,7 +132,7 @@ class Amber :
     // This runs on the foreground only
     val profileSubscription = ProfileSubscription(client, this, applicationIOScope)
 
-    val zapstoreUpdater: ZapstoreUpdater? = if (!BuildFlavorChecker.isOfflineFlavor()) {
+    val zapstoreUpdater: ZapstoreUpdater? = if (!BuildFlavorChecker.isOfflineFlavor() && !BuildConfig.IS_FDROID_BUILD) {
         ZapstoreUpdater(client, applicationIOScope)
     } else {
         null