diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java
index 18320d919..1eefd583a 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java
@@ -4,15 +4,13 @@ import android.app.Activity;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.ui.fragments.InstallGMSFragment;
+import ru.vtosters.lite.utils.GmsUtils;
 import ru.vtosters.lite.utils.NavigatorUtils;
 import ru.vtosters.lite.utils.Preferences;
 
-import static ru.vtosters.lite.utils.GmsUtils.isGmsInstalled;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-
 public class InstallGMS {
     public static void alert(final Activity activity) {
-        if (!isGmsInstalled() && getBoolValue("showAlertGms", true)) {
+        if (!GmsUtils.isAnyServicesInstalled() && Preferences.getBoolValue("showAlertGms", true)) {
             new VkAlertDialog.Builder(activity)
                     .setTitle(activity.getString(R.string.warning))
                     .setMessage(activity.getString(R.string.gmsissuesumm))
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
index b28659bbb..a9949efe3 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import androidx.annotation.StringRes;
 import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
@@ -190,7 +189,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme
             );
         }
 
-        if (!GmsUtils.isGmsInstalled()) {
+        if (!GmsUtils.isAnyServicesInstalled()) {
             PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.gmsname);
 
             PreferenceFragmentUtils.addPreference(
diff --git a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java b/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java
index 4d3d2dc50..67ba90773 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java
@@ -11,21 +11,29 @@ import com.google.firebase.iid.FirebaseInstanceIdReceiver2;
 import com.vtosters.lite.R;
 
 public class GmsUtils {
-    public static boolean gmsless = isGmsInstalled();
+    public static boolean needToSpoof = !isGmsInstalled() && isFakeGmsInstalled();
     public static boolean isGmsInstalled() {
         try {
             AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.google.android.gms", 0);
             return true;
         } catch (Exception unused) {
-            try {
-                AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.mgoogle.android.gms", 0);
-                return true;
-            } catch (Exception ignored) {
-                return false;
-            }
+            return false;
         }
     } // Google Market Services check
 
+    public static boolean isFakeGmsInstalled() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.mgoogle.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
+
+    public static boolean isAnyServicesInstalled() {
+        return isGmsInstalled() || isFakeGmsInstalled();
+    }
+
     public static void fixGapps() {
         if (Build.VERSION.SDK_INT >= 26 && !isGmsInstalled()) {
             NotificationManager notificationManager = (NotificationManager) AndroidUtils.getGlobalContext().getSystemService(Context.NOTIFICATION_SERVICE);
@@ -37,13 +45,13 @@ public class GmsUtils {
     } // Music channels fix
 
     public static void applyGMSReceiver() {
-        int flagSpoofed = gmsless ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-        int flagOrig = !gmsless ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        int flagSpoofed = needToSpoof ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        int flagOrig = !needToSpoof ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
 
         ComponentName spoofed = new ComponentName(AndroidUtils.getGlobalContext(), FirebaseInstanceIdReceiver2.class);
         ComponentName orig = new ComponentName(AndroidUtils.getGlobalContext(), FirebaseInstanceIdReceiver.class);
 
-        if (isComponentEnabled(orig) && gmsless || isComponentEnabled(spoofed) && !gmsless) {
+        if (isComponentEnabled(orig) && needToSpoof || isComponentEnabled(spoofed) && !needToSpoof) {
             setComponentEnabled(spoofed, flagSpoofed);
             setComponentEnabled(orig, flagOrig);
         }
@@ -58,14 +66,14 @@ public class GmsUtils {
     }
 
     public static String replaceGMSPackage(String str) {
-        return gmsless ? str.replace("com.google", "com.mgoogle") : str;
+        return needToSpoof ? str.replace("com.google", "com.mgoogle") : str;
     }
 
     public static String getFirebaseInstanceIdReceiver() {
-        return "com.google.firebase.iid.FirebaseInstanceIdReceiver" + (gmsless ? "2" : "");
+        return "com.google.firebase.iid.FirebaseInstanceIdReceiver" + (needToSpoof ? "2" : "");
     }
 
     public static Class getFirebaseInstanceIdReceiverClass() {
-        return gmsless ? FirebaseInstanceIdReceiver2.class : FirebaseInstanceIdReceiver.class;
+        return needToSpoof ? FirebaseInstanceIdReceiver2.class : FirebaseInstanceIdReceiver.class;
     }
 }