diff --git a/main/pbx.c b/main/pbx.c
index c1046fe39a..2782b57c61 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1645,6 +1645,8 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
 				nextexp = nextthing;
 				pos = nextexp - whereweare;
 				break;
+			default:
+				pos = 1;
 			}
 		}
 
@@ -1800,8 +1802,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
 				count -= length;
 				cp2 += length;
 			}
-		} else
-			break;
+		}
 	}
 }