diff --git a/src/dev_scheduler.erl b/src/dev_scheduler.erl
index 8b4da9629..e0d987b6b 100644
--- a/src/dev_scheduler.erl
+++ b/src/dev_scheduler.erl
@@ -957,7 +957,8 @@ do_get_remote_schedule(ProcID, LocalAssignments, From, To, Redirect, Opts) ->
                 <<
                     ProcID/binary, "?process-id=", ProcID/binary,
                     FromBin/binary, ToParam/binary,
-                    "&limit=", (hb_util:bin(?MAX_ASSIGNMENT_QUERY_LEN))/binary
+                    "&limit=", (hb_util:bin(?MAX_ASSIGNMENT_QUERY_LEN))/binary,
+                    "&show-anchor"
                 >>
         end,
     ?event({getting_remote_schedule, {node, {string, Node}}, {path, {string, Path}}}),
diff --git a/src/hb_gateway_client.erl b/src/hb_gateway_client.erl
index 6165841cf..5228740e6 100644
--- a/src/hb_gateway_client.erl
+++ b/src/hb_gateway_client.erl
@@ -261,11 +261,18 @@ result_to_message(ExpectedID, Item, Opts) ->
             512 -> {rsa, 65537};
             _ -> unsupported_tx_signature_type
         end,
+    ItemAnchor =
+        normalize_null(hb_maps:get(<<"anchor">>, Item, not_found, GQLOpts)),
+    Anchor = 
+        case byte_size(ItemAnchor) of
+            0 -> <<>>;
+            43 when is_binary(ItemAnchor) -> hb_util:decode(ItemAnchor);
+            _ -> ItemAnchor
+        end,
     TX =
         dev_arweave_common:reset_ids(#tx {
             format = ans104,
-            anchor =
-                normalize_null(hb_maps:get(<<"anchor">>, Item, not_found, GQLOpts)),
+            anchor = Anchor,
             signature = Signature,
             signature_type = SignatureType,
             target =