diff --git a/temporalio/worker/_activity.py b/temporalio/worker/_activity.py
index 28cc1458a..088ed0380 100644
--- a/temporalio/worker/_activity.py
+++ b/temporalio/worker/_activity.py
@@ -349,6 +349,7 @@ async def _handle_start_activity_task(
             store_target = StorageDriverActivityInfo(
                 id=start.activity_id or None,
                 type=start.activity_type or None,
+                run_id=start.run_id or None,
                 namespace=ns,
             )
         data_converter = self._data_converter._with_contexts(
diff --git a/tests/contrib/aws/s3driver/test_s3driver_worker.py b/tests/contrib/aws/s3driver/test_s3driver_worker.py
index e25be5fbf..86039bfd5 100644
--- a/tests/contrib/aws/s3driver/test_s3driver_worker.py
+++ b/tests/contrib/aws/s3driver/test_s3driver_worker.py
@@ -210,11 +210,17 @@ async def test_s3_driver_standalone_activity_input_key(
             start_to_close_timeout=timedelta(seconds=5),
         )
     keys = await _list_keys(aioboto3_client)
-    # Input and output are the same LARGE bytes, so they deduplicate to one key.
-    assert len(keys) == 1
-    # Keyed under the activity, not a workflow.
-    assert f"/ns/default/at/large_io_activity/ai/{activity_id}/ri/null/" in keys[0]
-    assert "/wt/" not in keys[0]
+    # Input and output are the same LARGE bytes but stored under different keys.
+    assert len(keys) == 2
+    # Both keyed under the activity, not a workflow.
+    assert all(
+        f"/ns/default/at/large_io_activity/ai/{activity_id}/ri/" in k for k in keys
+    )
+    assert all("/wt/" not in k for k in keys)
+    # Client-side store does not have run ID information
+    assert sum(1 for k in keys if "/ri/null/" in k) == 1
+    # Worker-side store does have run ID information
+    assert sum(1 for k in keys if "/ri/null/" not in k) == 1
 
 
 async def test_s3_driver_standalone_activity_output_key(
@@ -238,7 +244,8 @@ async def test_s3_driver_standalone_activity_output_key(
     keys = await _list_keys(aioboto3_client)
     # Only the output is large; keyed under the activity.
     assert len(keys) == 1
-    assert f"/ns/default/at/large_output_activity/ai/{activity_id}/ri/null/" in keys[0]
+    assert f"/ns/default/at/large_output_activity/ai/{activity_id}/ri/" in keys[0]
+    assert "/ri/null/" not in keys[0]
     assert "/wt/" not in keys[0]
 
 
diff --git a/tests/worker/test_extstore.py b/tests/worker/test_extstore.py
index 8b47b3f0c..56ede59d0 100644
--- a/tests/worker/test_extstore.py
+++ b/tests/worker/test_extstore.py
@@ -1350,7 +1350,7 @@ async def test_store_metadata_standalone_activity(env: WorkflowEnvironment) -> N
     assert execute_ctx.target.namespace == client.namespace
     assert execute_ctx.target.id == activity_id
     assert execute_ctx.target.type == "echo_activity"
-    assert execute_ctx.target.run_id is None
+    assert execute_ctx.target.run_id is not None
 
 
 @workflow.defn