diff --git a/setup/xapp-sm-connector/src/xapp.cc b/setup/xapp-sm-connector/src/xapp.cc
index 5c8adab..373eff3 100644
--- a/setup/xapp-sm-connector/src/xapp.cc
+++ b/setup/xapp-sm-connector/src/xapp.cc
@@ -88,13 +88,6 @@ void Xapp::stop(void){
 void Xapp::startup(SubscriptionHandler &sub_ref) {
 
     std::cout << "Startup beeing called";
-    while (true)
-    {
-        std::cout << "Send sub. req. inside the while true";
-        std::cout << "yeet";
-
-    	startup_subscribe_requests();
-    }
 
 	subhandler_ref = &sub_ref;
 
@@ -127,7 +120,15 @@ void Xapp::startup(SubscriptionHandler &sub_ref) {
         std::cout << "Querying target gNB" << std::endl;
         rnib_gnblist.push_back(GNB_ID);
     }
+    while (
+            true
+        )
+        {
+            std::cout << "Send sub. req.";
+            std::cout << "yeet";
 
+        	startup_subscribe_requests();
+        }
     // open external control socket in thread and wait for message
     ext_control_thr_rx = std::unique_ptr<std::thread>(new std::thread{&Xapp::handle_external_control_message, this, SOCKET_PORT_EXT});