diff --git a/NetDb.cpp b/NetDb.cpp
index 1752f1a9..6ef5df7f 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -71,7 +71,7 @@ namespace data
 	
 	void NetDb::Run ()
 	{
-		uint32_t lastSave = 0, lastPublish = 0, lastExploratory = 0, lastManageRequest = 0;
+		uint32_t lastSave = 0, lastPublish = 0, lastExploratory = 0, lastManageRequest = 0, lastDestinationCleanup = 0;
 		while (m_IsRunning)
 		{	
 			try
@@ -121,7 +121,11 @@ namespace data
 					}	
 					lastSave = ts;
 				}
-
+				if (ts - lastDestinationCleanup >= i2p::garlic::INCOMING_TAGS_EXPIRATION_TIMEOUT) 
+				{
+					i2p::context.CleanupDestination ();
+					lastDestinationCleanup = ts;
+				}
         // if we're in hidden mode don't publish or explore
 				// if (m_HiddenMode) continue;
 				
diff --git a/RouterContext.cpp b/RouterContext.cpp
index f2c2bc48..3b16d81a 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -439,6 +439,12 @@ namespace i2p
 		std::unique_lock<std::mutex> l(m_GarlicMutex);
 		i2p::garlic::GarlicDestination::ProcessDeliveryStatusMessage (msg);
 	}	
+
+	void RouterContext::CleanupDestination ()
+	{
+		std::unique_lock<std::mutex> l(m_GarlicMutex);
+		i2p::garlic::GarlicDestination::CleanupExpiredTags ();
+	}
 		
 	uint32_t RouterContext::GetUptime () const
 	{
diff --git a/RouterContext.h b/RouterContext.h
index 05339847..27e0947d 100644
--- a/RouterContext.h
+++ b/RouterContext.h
@@ -71,7 +71,8 @@ namespace i2p
 			void SetSupportsV4 (bool supportsV4);
 
 			void UpdateNTCPV6Address (const boost::asio::ip::address& host); // called from NTCP session		
-			void UpdateStats ();		
+			void UpdateStats ();	
+			void CleanupDestination ();	// garlic destination
 
 			// implements LocalDestination
 			std::shared_ptr<const i2p::data::IdentityEx> GetIdentity () const { return m_Keys.GetPublic (); };