diff --git a/code/datums/components/tameable.dm b/code/datums/components/tameable.dm
index 665ccbbb664..918011637d5 100644
--- a/code/datums/components/tameable.dm
+++ b/code/datums/components/tameable.dm
@@ -60,4 +60,4 @@
 		evil_but_now_not_evil.friends = tamer
 		evil_but_now_not_evil.faction = tamer.faction.Copy()
 
-	RemoveComponent()
+	qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index c289778a3ed..5e0959a1a2d 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -73,6 +73,7 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
 	add_cell_sample()
+	make_tameable()
 
 
 /mob/living/simple_animal/hostile/carp/add_cell_sample()