diff --git a/srsenb/hdr/stack/upper/sdap.h b/srsenb/hdr/stack/upper/sdap.h
new file mode 100644
index 000000000..a8b3a175c
--- /dev/null
+++ b/srsenb/hdr/stack/upper/sdap.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013-2020 Software Radio Systems Limited
+ *
+ * This file is part of srsLTE.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#ifndef SRSENB_SDAP_H
+#define SRSENB_SDAP_H
+
+#include "srslte/common/buffer_pool.h"
+#include "srslte/common/common.h"
+#include "srslte/common/logmap.h"
+#include "srslte/interfaces/gnb_interfaces.h"
+
+namespace srsenb {
+
+class sdap : public sdap_interface_pdcp_nr, public sdap_interface_gtpu_nr
+{
+public:
+  explicit sdap();
+  bool init(pdcp_interface_sdap_nr* pdcp_, gtpu_interface_sdap_nr* gtpu_);
+  void stop();
+
+  // Interface for PDCP
+  void write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) final;
+
+  // Interface for GTPU
+  void write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu) final;
+
+private:
+  srslte::log_ref         m_log{"SDAP"};
+  gtpu_interface_sdap_nr* m_gtpu = nullptr;
+  pdcp_interface_sdap_nr* m_pdcp = nullptr;
+
+  // state
+  bool running = false;
+};
+
+} // namespace srsenb
+
+#endif // SRSENB_SDAP_H
diff --git a/srsenb/src/stack/upper/CMakeLists.txt b/srsenb/src/stack/upper/CMakeLists.txt
index f12b3dfea..85b8e2659 100644
--- a/srsenb/src/stack/upper/CMakeLists.txt
+++ b/srsenb/src/stack/upper/CMakeLists.txt
@@ -22,7 +22,7 @@ set(SOURCES gtpu.cc pdcp.cc rlc.cc s1ap.cc)
 add_library(srsenb_upper STATIC ${SOURCES})
 
 if(ENABLE_5GNR)
-    set(SOURCES pdcp_nr.cc rlc_nr.cc)
+    set(SOURCES pdcp_nr.cc rlc_nr.cc sdap.cc)
     add_library(srsgnb_upper STATIC ${SOURCES})
 endif()
 
diff --git a/srsenb/src/stack/upper/sdap.cc b/srsenb/src/stack/upper/sdap.cc
new file mode 100644
index 000000000..3933854de
--- /dev/null
+++ b/srsenb/src/stack/upper/sdap.cc
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2020 Software Radio Systems Limited
+ *
+ * This file is part of srsLTE.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#include "srsenb/hdr/stack/upper/sdap.h"
+
+namespace srsenb {
+
+sdap::sdap() : m_log("SDAP") {}
+
+bool sdap::init(pdcp_interface_sdap_nr* pdcp_, gtpu_interface_sdap_nr* gtpu_)
+{
+  m_gtpu = gtpu_;
+  m_pdcp = pdcp_;
+
+  running = true;
+  return true;
+}
+
+void sdap::stop()
+{
+  if (running) {
+    running = false;
+  }
+}
+
+void sdap::write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu)
+{
+  // for now just forwards it
+  m_gtpu->write_pdu(rnti, lcid, std::move(pdu));
+}
+
+void sdap::write_sdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t pdu)
+{
+  m_pdcp->write_sdu(rnti, lcid, std::move(pdu));
+}
+
+} // namespace srsenb
\ No newline at end of file