diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 34df1ca124e..f10f2252d0c 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -214,8 +214,6 @@ Class Procs:
 /obj/machinery/CanUseTopic(var/mob/user)
 	if(!interact_offline && (stat & (NOPOWER | BROKEN)))
 		return STATUS_CLOSE
-	// return ..()		// This doesn't call the parent with the correct number of arguments (causing a runtime in /code/modules/nano/interaction/base.dm), nor easily provide any indication as to what the datum/topic_state should be, so this is clearly the wrong action.
-	return STATUS_INTERACTIVE
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 61005069daa..c7b8c07f8db 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -55,7 +55,7 @@
 	CouldNotUseTopic(usr)
 	return 1
 
-/obj/CanUseTopic(var/mob/user, var/datum/topic_state/state)
+/obj/CanUseTopic(var/mob/user, var/datum/topic_state/state = default_state)
 	if(user.CanUseObjTopic(src))
 		return ..()
 	to_chat(user, "<span class='danger'>\icon[src]Access Denied!</span>")