diff --git a/src/core_ghidra.cpp b/src/core_ghidra.cpp
index cdaf958c..b7929904 100644
--- a/src/core_ghidra.cpp
+++ b/src/core_ghidra.cpp
@@ -142,8 +142,10 @@ static void Decompile(RzCore *core, ut64 addr, DecompileMode mode, std::stringst
 	if(!func)
 		throw LowlevelError("No function in Scope");
 
-	// Must be called after arch.init(), but before decompiling the function
-	PcodeFixupPreprocessor::fixupSharedReturnJumpToRelocs(function, func, core, arch);
+	// Other archs are not tested
+	if (strcmp(core->analysis->arch_target->arch, "x86") == 0)
+		// Must be called after arch.init(), but before decompiling the function
+		PcodeFixupPreprocessor::fixupSharedReturnJumpToRelocs(function, func, core, arch);
 
 	arch.getCore()->sleepBegin();
 	auto action = arch.allacts.getCurrent();