diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionSignatureCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionSignatureCmd.java
index 1a87d98c0d..0e01d44b3d 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionSignatureCmd.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionSignatureCmd.java
@@ -140,7 +140,11 @@ public class ApplyFunctionSignatureCmd extends BackgroundCommand {
 			func.updateFunction(conventionName, returnParam, params,
 				FunctionUpdateType.DYNAMIC_STORAGE_FORMAL_PARAMS, false, source);
 			func.setVarArgs(signature.hasVarArgs());
-			func.setNoReturn(signature.hasNoReturn());
+			
+			// Only apply noreturn if signature has it set
+			if (signature.hasNoReturn()) {
+				func.setNoReturn(signature.hasNoReturn());
+			}
 		}
 		catch (DuplicateNameException e) {
 			// should not happen unless caused by a concurrent operation