diff --git a/src/components/organisms/deployments/sessions/tabs/activities/singleActivityInfo.tsx b/src/components/organisms/deployments/sessions/tabs/activities/singleActivityInfo.tsx
index e81649118e..9a7e8ad864 100644
--- a/src/components/organisms/deployments/sessions/tabs/activities/singleActivityInfo.tsx
+++ b/src/components/organisms/deployments/sessions/tabs/activities/singleActivityInfo.tsx
@@ -7,7 +7,7 @@ import { triggerEvent } from "@src/hooks";
 import { SessionActivity } from "@src/interfaces/models";
 
 import { Button } from "@components/atoms";
-import { JsonViewer, ValueRenderer } from "@components/molecules";
+import { JsonViewer } from "@components/molecules";
 
 import { ArrowLeft, Close } from "@assets/image/icons";
 
@@ -66,7 +66,12 @@ export const SingleActivityInfo = ({
 					)}
 
 					<div className="mb-4 mt-8 font-bold">{t("returnValues")}</div>
-					<ValueRenderer value={activity.returnValue?.value} />
+
+					{activity.returnValue?.value && Object.keys(activity.returnValue.value).length ? (
+						<JsonViewer isCollapsed={true} value={activity.returnValue.value} />
+					) : (
+						<div>{t("noReturnValuesFound")}</div>
+					)}
 				</div>
 			</div>
 		</div>
diff --git a/src/models/activity.model.ts b/src/models/activity.model.ts
index d380bad32a..b51f3824cd 100644
--- a/src/models/activity.model.ts
+++ b/src/models/activity.model.ts
@@ -84,9 +84,19 @@ export function convertSessionLogRecordsProtoToActivitiesModel(
 
 			if (callAttemptComplete.result?.value) {
 				try {
-					const parsedValue = safeParseSingleProtoValue(callAttemptComplete.result.value);
-					currentActivity.returnValue =
-						parsedValue || ({ type: "object", value: {} } as DeepProtoValueResult);
+					let parsedValue = safeParseSingleProtoValue(callAttemptComplete.result.value);
+
+					if (typeof parsedValue === "string") {
+						try {
+							parsedValue = JSON.parse(parsedValue);
+						} catch {
+							parsedValue = { value: parsedValue };
+						}
+					}
+
+					currentActivity.returnValue = parsedValue
+						? { type: "object", value: parsedValue }
+						: { type: "object", value: {} };
 				} catch {
 					currentActivity.returnValue = { type: "object", value: {} } as DeepProtoValueResult;
 				}