diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index fb3ba98346..3938f819b4 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -160,6 +160,13 @@ void main(void)
 #endif
     }
 
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+    /* It is necessary for proper detection AMSv2 variant 1.
+     * We should restore initial state of GPIOB_PIN(5) as it used for
+     * variant detection, but can be changed if we switch SD card. */
+    if (amsv2_variant == 1)
+        GPIOB_PIN(5) = 1 << 5;
+#endif
     kernel_entry = (void*) loadbuffer;
     commit_discard_idcache();
     printf("Executing");
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 266ba79e69..d432642d9d 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -275,6 +275,13 @@ int rolo_load(const char* filename)
     /* Set CVDD1 power supply to default*/
     ascodec_write_pmu(0x17, 1, 0);
 #endif
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+    /* It is necessary for proper detection AMSv2 variant 1.
+     * We should restore initial state of GPIOB_PIN(5) as it used for
+     * variant detection, but can be changed if we switch SD card. */
+    if (amsv2_variant == 1)
+        GPIOB_PIN(5) = 1 << 5;
+#endif
 
 #if CONFIG_CPU != IMX31L /* We're not finished yet */
 #ifdef CPU_ARM