diff --git a/src/AP_WS_Connection.cpp b/src/AP_WS_Connection.cpp
index 9d2edc70..216cf75b 100644
--- a/src/AP_WS_Connection.cpp
+++ b/src/AP_WS_Connection.cpp
@@ -142,6 +142,7 @@ namespace OpenWifi {
 
 			if(AP_WS_Server::IsSim(CN_)) {
 				State_.VerifiedCertificate = GWObjects::SIMULATED;
+				Simulated_ = true;
 			}
 
 			std::string reason, author;
diff --git a/src/AP_WS_Connection.h b/src/AP_WS_Connection.h
index a61343df..a5347faf 100644
--- a/src/AP_WS_Connection.h
+++ b/src/AP_WS_Connection.h
@@ -202,6 +202,7 @@ namespace OpenWifi {
 		bool hasGPS=false;
 		std::double_t 	memory_used_=0.0, cpu_load_ = 0.0, temperature_ = 0.0;
 		std::uint64_t 	uuid_=0;
+		bool	Simulated_=false;
 	};
 
 } // namespace OpenWifi
\ No newline at end of file
diff --git a/src/AP_WS_Process_connect.cpp b/src/AP_WS_Process_connect.cpp
index b7667d4f..e5af1409 100644
--- a/src/AP_WS_Process_connect.cpp
+++ b/src/AP_WS_Process_connect.cpp
@@ -241,7 +241,7 @@ namespace OpenWifi {
 					StorageService()->UpdateDevice(DeviceInfo);
 				}
 
-				if(!DeviceInfo.simulated) {
+				if(!Simulated_) {
 					uint64_t UpgradedUUID = 0;
 					LookForUpgrade(UUID, UpgradedUUID);
 					State_.UUID = UpgradedUUID;
diff --git a/src/AP_WS_Process_state.cpp b/src/AP_WS_Process_state.cpp
index 794dff30..646b37de 100644
--- a/src/AP_WS_Process_state.cpp
+++ b/src/AP_WS_Process_state.cpp
@@ -39,9 +39,11 @@ namespace OpenWifi {
 												UUID, request_uuid));
 			}
 
-			uint64_t UpgradedUUID;
-			LookForUpgrade(UUID, UpgradedUUID);
-			State_.UUID = UpgradedUUID;
+			if(!Simulated_) {
+				uint64_t UpgradedUUID;
+				LookForUpgrade(UUID, UpgradedUUID);
+				State_.UUID = UpgradedUUID;
+			}
 			SetLastStats(StateStr);
 
 			GWObjects::Statistics Stats{