diff --git a/arch/arm64/kvm/hyp/include/nvhe/ffa.h b/arch/arm64/kvm/hyp/include/nvhe/ffa.h
index 5670b94..614d4a0 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/ffa.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/ffa.h
@@ -9,6 +9,8 @@
 #include <asm/kvm_host.h>
 #include <nvhe/pkvm.h>
 
+#include "trap_handler.h"
+
 #define FFA_MIN_FUNC_NUM 0x60
 #define FFA_MAX_FUNC_NUM 0x7F
 
@@ -30,6 +32,13 @@ static inline bool is_ffa_call(u64 func_id)
 	       ARM_SMCCC_FUNC_NUM(func_id) <= FFA_MAX_FUNC_NUM;
 }
 
+static inline bool is_ffa_error(struct kvm_vcpu *vcpu)
+{
+	struct kvm_cpu_context *ctxt = &vcpu->arch.ctxt;
+
+	return (cpu_reg(ctxt, 0) == FFA_ERROR);
+}
+
 bool hyp_ffa_release_buffers(struct pkvm_hyp_vcpu *vcpu, int vmid, void *addr);
 int guest_ffa_reclaim_memory(struct pkvm_hyp_vm *vm);
 
diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index eadcc5d..08c9869 100644
--- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
+++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
@@ -1521,7 +1521,7 @@ bool kvm_handle_pvm_smc64(struct kvm_vcpu *vcpu, u64 *exit_code)
 		 * process the request.
 		 */
 		return false;
-	} else if (ret > 0) {
+	} else if (ret > 0 && !is_ffa_error(vcpu)) {
 		handled = kvm_guest_filter_smc64(vcpu);
 	}