diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 0c67cf830..502d5f12a 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2702,6 +2702,8 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
 
     case RIG_VFO_MAIN:
         icvfo = S_MAIN;
+        // If not split or satmode then we must want VFOA
+        if (VFO_HAS_MAIN_SUB_A_B_ONLY && !priv->split_on && !rig->state.cache.satmode) { icvfo = S_VFOA; }
         break;
 
     case RIG_VFO_SUB:
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index dcdd8259b..886e70981 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20211015"
+#define BACKEND_VER "20211020"
 
 #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
 #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)