diff --git a/main/features.c b/main/features.c
index 6aa717aec3..b49f9c8b68 100644
--- a/main/features.c
+++ b/main/features.c
@@ -1697,8 +1697,13 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer,
 
 	ast_autoservice_stop(idle);
 
-	if (res == AST_PBX_KEEPALIVE)
-		return AST_FEATURE_RETURN_PBX_KEEPALIVE;
+	if (res == AST_PBX_KEEPALIVE) {
+		/* do not hangup peer if feature is to be activated on it */
+		if ((ast_test_flag(feature, AST_FEATURE_FLAG_ONPEER) && sense == FEATURE_SENSE_CHAN) || (ast_test_flag(feature, AST_FEATURE_FLAG_ONSELF) && sense == FEATURE_SENSE_PEER))
+			return AST_FEATURE_RETURN_NO_HANGUP_PEER;
+		else
+			return AST_FEATURE_RETURN_PBX_KEEPALIVE;
+	}
 	else if (res == AST_PBX_NO_HANGUP_PEER)
 		return AST_FEATURE_RETURN_NO_HANGUP_PEER;
 	else if (res)
@@ -1747,12 +1752,13 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
 {
 	int x;
 	struct ast_flags features;
-	int res = AST_FEATURE_RETURN_PASSDIGITS;
 	struct ast_call_feature *feature;
 	struct feature_group *fg = NULL;
 	struct feature_group_exten *fge;
 	const char *dynamic_features;
 	char *tmp, *tok;
+	int res = AST_FEATURE_RETURN_PASSDIGITS;
+	int feature_detected = 0;
 
 	if (sense == FEATURE_SENSE_CHAN) {
 		ast_copy_flags(&features, &(config->features_caller), AST_FLAGS_ALL);
@@ -1771,6 +1777,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
 			/* Feature is up for consideration */
 			if (!strcmp(builtin_features[x].exten, code)) {
 				res = builtin_features[x].operation(chan, peer, config, code, sense, NULL);
+				feature_detected = 1;
 				break;
 			} else if (!strncmp(builtin_features[x].exten, code, strlen(code))) {
 				if (res == AST_FEATURE_RETURN_PASSDIGITS)
@@ -1780,7 +1787,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
 	}
 	ast_rwlock_unlock(&features_lock);
 
-	if (ast_strlen_zero(dynamic_features))
+	if (ast_strlen_zero(dynamic_features) || feature_detected)
 		return res;
 
 	tmp = ast_strdupa(dynamic_features);
diff --git a/res/res_agi.c b/res/res_agi.c
index 02b666c385..35e1d7e414 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2948,7 +2948,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
 		return -1;
 	}
 
-	return 0;
+	return res;
 }
 
 static int agi_exec(struct ast_channel *chan, void *data)