diff --git a/openbsc/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c
index 31526e9..17a5831 100644
--- a/openbsc/src/gsm_04_11.c
+++ b/openbsc/src/gsm_04_11.c
@@ -560,7 +560,8 @@
 	case GSM340_TP_VPF_ENHANCED:
 		sms_vp = smsp;
 		/* the additional functionality indicator... */
-		if (*smsp & (1<<7)) smsp++;
+		if (sms_vpf == GSM340_TP_VPF_ENHANCED && *smsp & (1<<7))
+			smsp++;
 		smsp += 7;
 		break;
 	case GSM340_TP_VPF_NONE: