diff --git a/upub/cli/src/fix_activities.rs b/upub/cli/src/fix_activities.rs
new file mode 100644
index 0000000..7612e95
--- /dev/null
+++ b/upub/cli/src/fix_activities.rs
@@ -0,0 +1,71 @@
+use futures::TryStreamExt;
+use sea_orm::{ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, ActiveModelTrait};
+
+macro_rules! ok_or_continue {
+	($x:expr) => {
+		match $x {
+			Some(x) => x,
+			None => continue,
+		}
+	};
+}
+
+pub async fn fix_activities(ctx: upub::Context, likes: bool, announces: bool) -> Result<(), Box<dyn std::error::Error>> {
+	if likes {
+		tracing::info!("fixing like activities...");
+		let mut stream = upub::model::activity::Entity::find()
+			.filter(upub::model::activity::Column::ActivityType.eq(apb::ActivityType::Like))
+			.filter(upub::model::activity::Column::Object.is_not_null())
+			.stream(ctx.db())
+			.await?;
+
+		while let Some(activity) = stream.try_next().await? {
+			let oid = ok_or_continue!(activity.object);
+			let internal_oid = ok_or_continue!(upub::model::object::Entity::ap_to_internal(&oid, ctx.db()).await?);
+			let uid = activity.actor;
+			let internal_uid = ok_or_continue!(upub::model::actor::Entity::ap_to_internal(&uid, ctx.db()).await?);
+			if let Some(like) = upub::model::like::Entity::find()
+				.filter(upub::model::like::Column::Object.eq(internal_oid))
+				.filter(upub::model::like::Column::Actor.eq(internal_uid))
+				.filter(upub::model::like::Column::Published.eq(activity.published))
+				.one(ctx.db())
+				.await?
+			{
+				let mut active = like.into_active_model();
+				active.activity = sea_orm::Set(Some(activity.internal));
+				active.update(ctx.db()).await?;
+			}
+		}
+	}
+
+	if announces {
+		tracing::info!("fixing announce activities...");
+		let mut stream = upub::model::activity::Entity::find()
+			.filter(upub::model::activity::Column::ActivityType.eq(apb::ActivityType::Announce))
+			.filter(upub::model::activity::Column::Object.is_not_null())
+			.stream(ctx.db())
+			.await?;
+
+		while let Some(activity) = stream.try_next().await? {
+			let oid = ok_or_continue!(activity.object);
+			let internal_oid = ok_or_continue!(upub::model::object::Entity::ap_to_internal(&oid, ctx.db()).await?);
+			let uid = activity.actor;
+			let internal_uid = ok_or_continue!(upub::model::actor::Entity::ap_to_internal(&uid, ctx.db()).await?);
+			if let Some(like) = upub::model::announce::Entity::find()
+				.filter(upub::model::announce::Column::Object.eq(internal_oid))
+				.filter(upub::model::announce::Column::Actor.eq(internal_uid))
+				.filter(upub::model::announce::Column::Published.eq(activity.published))
+				.one(ctx.db())
+				.await?
+			{
+				let mut active = like.into_active_model();
+				active.activity = sea_orm::Set(Some(activity.internal));
+				active.update(ctx.db()).await?;
+			}
+		}
+	}
+
+	tracing::info!("done");
+
+	Ok(())
+}
diff --git a/upub/cli/src/lib.rs b/upub/cli/src/lib.rs
index c71dcb4..98e5e03 100644
--- a/upub/cli/src/lib.rs
+++ b/upub/cli/src/lib.rs
@@ -1,6 +1,9 @@
 mod count;
 pub use count::*;
 
+mod fix_activities;
+pub use fix_activities::*;
+
 mod fetch;
 pub use fetch::*;
 
@@ -136,6 +139,17 @@ pub enum CliCommand {
 		#[arg(long, default_value_t = false)]
 		contents: bool,
 	},
+
+	/// restore activities links, only needed for very old installs
+	FixActivities {
+		/// restore like activity links
+		#[arg(long, default_value_t = false)]
+		likes: bool,
+
+		/// restore announces activity links
+		#[arg(long, default_value_t = false)]
+		announces: bool,
+	},
 }
 
 pub async fn run(ctx: upub::Context, command: CliCommand) -> Result<(), Box<dyn std::error::Error>> {
@@ -159,5 +173,7 @@ pub async fn run(ctx: upub::Context, command: CliCommand) -> Result<(), Box<dyn
 			Ok(thread(ctx).await?),
 		CliCommand::Cloak { objects, actors, contents } =>
 			Ok(cloak(ctx, contents, objects, actors).await?),
+		CliCommand::FixActivities { likes, announces } =>
+			Ok(fix_activities(ctx, likes, announces).await?),
 	}
 }