diff --git a/src/ssb.rpc.c b/src/ssb.rpc.c
index ab64eb89..9a48ba41 100644
--- a/src/ssb.rpc.c
+++ b/src/ssb.rpc.c
@@ -593,6 +593,7 @@ static void _tf_ssb_rpc_connection_blobs_get_callback(
 		bool stored = true;
 		tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_stream | k_ssb_rpc_flag_end_error, -request_number, NULL,
 			(const uint8_t*)(stored ? "true" : "false"), strlen(stored ? "true" : "false"), NULL, NULL, NULL);
+		tf_ssb_connection_remove_request(connection, -request_number);
 	}
 }
 
@@ -1138,6 +1139,7 @@ static void _tf_ssb_rpc_ebt_replicate(tf_ssb_connection_t* connection, uint8_t f
 	if (_is_error(context, args))
 	{
 		/* TODO: Send createHistoryStream. */
+		tf_ssb_connection_set_ebt_request_number(connection, 0);
 		tf_ssb_connection_remove_request(connection, -request_number);
 		return;
 	}