diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java
index d7d035ba0a..d8d6848a35 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java
@@ -169,8 +169,10 @@ public class ReturnParameterDB extends ParameterDB {
 
 	@Override
 	public SourceType getSource() {
-		// VARDO: What source-type should be used ?
-		return function.getSymbol().getSource();
+		if (dataType == null || Undefined.isUndefined(dataType)) {
+			return SourceType.DEFAULT;
+		}
+		return function.getSignatureSource();
 	}
 
 	@Override