diff --git a/modules/you_done_it/client_node.cpp b/modules/you_done_it/client_node.cpp
index 8ddb6a70..1259113a 100644
--- a/modules/you_done_it/client_node.cpp
+++ b/modules/you_done_it/client_node.cpp
@@ -24,9 +24,8 @@ void ClientNode::enter_tree() {
 	if (singleton_instance) {
 		print_error("Attempt to create duplicate ClientNode, aborting");
 		abort();
-	} else {
-		singleton_instance = this;
 	}
+	singleton_instance = this;
 }
 
 void ClientNode::process() {
@@ -71,6 +70,7 @@ void ClientNode::_notification(int what) {
 			return;
 		case NOTIFICATION_ENTER_TREE:
 			set_process(true);
+			enter_tree();
 			return;
 		case NOTIFICATION_PROCESS:
 			process();