diff --git a/src/freedombone-utils-i2p b/src/freedombone-utils-i2p
index f9c25f06..c3719131 100755
--- a/src/freedombone-utils-i2p
+++ b/src/freedombone-utils-i2p
@@ -68,6 +68,13 @@ function remove_i2p {
     # This might not be true in future
     sed -i 's|net.ipv6.conf.all.disable_ipv6.*|net.ipv6.conf.all.disable_ipv6 = 1|g' /etc/sysctl.conf
     /sbin/sysctl -p -q
+
+    if [ -d /var/lib/i2p ]; then
+        rm -rf /var/lib/i2p
+    fi
+    if [ -d /etc/i2p ]; then
+        rm -rf /etc/i2p
+    fi
 }
 
 function i2p_enable_sam {