diff --git a/code/modules/smithing/machinery/casting_basin.dm b/code/modules/smithing/machinery/casting_basin.dm
index 24f8c1b1be5..12e5708ece0 100644
--- a/code/modules/smithing/machinery/casting_basin.dm
+++ b/code/modules/smithing/machinery/casting_basin.dm
@@ -115,13 +115,14 @@
 		to_chat(user, "<span class='warning'>[used] does not fit in [src]'s cast slot.</span>")
 		return
 
-	if(cast)
-		to_chat(user, "<span class='warning'>[src] already has a cast inserted.</span>")
-		return
-
 	if(used.flags & NODROP || !user.transfer_item_to(used, src))
 		to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
 		return ITEM_INTERACT_COMPLETE
+	if(cast)
+		user.put_in_active_hand(cast)
+		to_chat(user, "<span class='notice'>You swap [used] with [cast] in [src].</span>")
+	else
+		to_chat(user, "<span class='notice'>You insert [used] into [src].</span>")
 	cast = used
 	update_icon(UPDATE_OVERLAYS)
 	return ITEM_INTERACT_COMPLETE
diff --git a/code/modules/smithing/smith_machinery.dm b/code/modules/smithing/smith_machinery.dm
index 6e5e4dbdee3..d01456bec2c 100644
--- a/code/modules/smithing/smith_machinery.dm
+++ b/code/modules/smithing/smith_machinery.dm
@@ -52,14 +52,16 @@
 		return FINISH_ATTACK
 
 	if(istype(used, /obj/item/smithed_item/component))
-		if(working_component)
-			to_chat(user, "<span class='warning'>There is already a component in the machine!</span>")
-			return ITEM_INTERACT_COMPLETE
-
 		if(used.flags & NODROP || !user.drop_item() || !used.forceMove(src))
 			to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
 			return ITEM_INTERACT_COMPLETE
 
+		if(working_component)
+			user.put_in_active_hand(working_component)
+			to_chat(user, "<span class='notice'>You swap [used] with [working_component] in [src].</span>")
+		else
+			to_chat(user, "<span class='notice'>You insert [used] into [src].</span>")
+
 		working_component = used
 		return ITEM_INTERACT_COMPLETE
 	return ..()