diff --git a/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.premium.ExtraFeaturesService b/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.premium.ExtraFeaturesService
deleted file mode 100644
index 03cfe20d2..000000000
--- a/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.premium.ExtraFeaturesService
+++ /dev/null
@@ -1 +0,0 @@
-org.mariotaku.twidere.util.premium.DummyExtraFeaturesService
\ No newline at end of file
diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/premium/DummyExtraFeaturesService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/DummyExtraFeaturesService.kt
similarity index 100%
rename from twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/premium/DummyExtraFeaturesService.kt
rename to twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/DummyExtraFeaturesService.kt
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt
index 2c9ef7143..e99356fd5 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/premium/ExtraFeaturesService.kt
@@ -47,7 +47,9 @@ abstract class ExtraFeaturesService {
         const val FEATURE_SCHEDULE_STATUS = "schedule_status"
 
         fun newInstance(context: Context): ExtraFeaturesService {
-            val instance = ServiceLoader.load(ExtraFeaturesService::class.java).first()
+            val instance = ServiceLoader.load(ExtraFeaturesService::class.java).firstOrNull() ?: run {
+                return@run DummyExtraFeaturesService()
+            }
             instance.init(context)
             return instance
         }