diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index e3bd306b..00c1a6b6 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -727,7 +727,7 @@ int random_path(Onion_Client *onion_c, Node_format *nodes)
     return 0;
 }
 
-#define ANNOUNCE_FRIEND 90
+#define ANNOUNCE_FRIEND 30
 
 static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
 {
@@ -782,7 +782,7 @@ void oniondata_registerhandler(Onion_Client *onion_c, uint8_t byte, oniondata_ha
 }
 
 #define ANNOUNCE_INTERVAL_NOT_ANNOUNCED 10
-#define ANNOUNCE_INTERVAL_ANNOUNCED 90
+#define ANNOUNCE_INTERVAL_ANNOUNCED 30
 
 static void do_announce(Onion_Client *onion_c)
 {
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
index 9491b0b7..708d9093 100644
--- a/toxcore/onion_client.h
+++ b/toxcore/onion_client.h
@@ -30,7 +30,7 @@
 #define ONION_NODE_TIMEOUT 240
 
 /* The interval in seconds at which to tell our friends where we are */
-#define ONION_FAKEID_INTERVAL 60
+#define ONION_FAKEID_INTERVAL 30
 #define DHT_FAKEID_INTERVAL 20
 
 typedef struct {