diff --git a/tmtcc.py b/tmtcc.py
index bb9b7ff..73c00e8 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -161,6 +161,15 @@ def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
         indication_cfg=IndicationCfg(),
         default_fault_handlers=fh_base,
     )
+    self_as_remote = RemoteEntityCfg(
+        closure_requested=False,
+        entity_id=CFDP_LOCAL_ENTITY_ID,
+        max_file_segment_len=990,
+        check_limit=None,
+        crc_on_transmission=False,
+        crc_type=ChecksumType.CRC_32,
+        default_transmission_mode=TransmissionMode.UNACKNOWLEDGED
+    )
     remote_cfg = RemoteEntityCfg(
         closure_requested=False,
         entity_id=CFDP_REMOTE_ENTITY_ID,
@@ -179,7 +188,7 @@ def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
     cfdp_user = EiveCfdpUser()
     cfdp_in_ccsds_handler = CfdpInCcsdsHandler(
         cfg=cfdp_cfg,
-        remote_cfgs=[remote_cfg],
+        remote_cfgs=[remote_cfg, self_as_remote],
         ccsds_apid=CFDP_APID,
         ccsds_seq_cnt_provider=cfdp_ccsds_seq_count_provider,
         cfdp_seq_cnt_provider=cfdp_seq_count_provider,