diff --git a/daemon/face/generic-link-service.cpp b/daemon/face/generic-link-service.cpp
index a2c8541..2834f94 100644
--- a/daemon/face/generic-link-service.cpp
+++ b/daemon/face/generic-link-service.cpp
@@ -159,6 +159,13 @@
   else {
     lpPacket.add<lp::HopCountTagField>(0);
   }
+
+  if (m_options.enableGeoTags) {
+    auto geoTag = m_options.enableGeoTags();
+    if (geoTag != nullptr) {
+      lpPacket.add<lp::GeoTagField>(*geoTag);
+    }
+  }
 }
 
 void
@@ -361,6 +368,10 @@
     interest->setTag(make_shared<lp::HopCountTag>(firstPkt.get<lp::HopCountTagField>() + 1));
   }
 
+  if (m_options.enableGeoTags && firstPkt.has<lp::GeoTagField>()) {
+    interest->setTag(make_shared<lp::GeoTag>(firstPkt.get<lp::GeoTagField>()));
+  }
+
   if (firstPkt.has<lp::NextHopFaceIdField>()) {
     if (m_options.allowLocalFields) {
       interest->setTag(make_shared<lp::NextHopFaceIdTag>(firstPkt.get<lp::NextHopFaceIdField>()));
@@ -415,6 +426,10 @@
     data->setTag(make_shared<lp::HopCountTag>(firstPkt.get<lp::HopCountTagField>() + 1));
   }
 
+  if (m_options.enableGeoTags && firstPkt.has<lp::GeoTagField>()) {
+    data->setTag(make_shared<lp::GeoTag>(firstPkt.get<lp::GeoTagField>()));
+  }
+
   if (firstPkt.has<lp::NackField>()) {
     ++this->nInNetInvalid;
     NFD_LOG_FACE_WARN("received Nack with Data: DROP");