diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h
index 0130e3efc..9d34f1915 100644
--- a/src/ArduinoIoTCloud.h
+++ b/src/ArduinoIoTCloud.h
@@ -89,8 +89,8 @@ class ArduinoIoTCloudClass
             void push();
             bool setTimestamp(String const & prop_name, unsigned long const timestamp);
 
-    inline void     setThingId (String const thing_id)  { _thing_id = thing_id; };
-    inline String & getThingId ()                       { return _thing_id; };
+    inline void     setThingId (String const thing_id)  { _thing_id = thing_id; } __attribute__((deprecated("It is no longer necessary to configure a THING ID.")));
+    inline String & getThingId ()                       { return _thing_id; }     __attribute__((deprecated("It is no longer necessary to configure a THING ID.")));
     inline void     setDeviceId(String const device_id) { _device_id = device_id; };
     inline String & getDeviceId()                       { return _device_id; };
 
diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h
index f29aafde7..6d0392148 100644
--- a/src/ArduinoIoTCloudTCP.h
+++ b/src/ArduinoIoTCloudTCP.h
@@ -132,10 +132,10 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     bool _ota_req;
 #endif /* OTA_ENABLED */
 
-    inline String getTopic_shadowout() { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/o"); }
-    inline String getTopic_shadowin () { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/i"); }
-    inline String getTopic_dataout  () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/o") : String("/a/t/" + getThingId() + "/e/o"); }
-    inline String getTopic_datain   () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/i") : String("/a/t/" + getThingId() + "/e/i"); }
+    inline String getTopic_shadowout() { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/shadow/o") : String("/a/t/" + getThingId() + "/shadow/o"); }
+    inline String getTopic_shadowin () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/shadow/i") : String("/a/t/" + getThingId() + "/shadow/i"); }
+    inline String getTopic_dataout  () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/o")      : String("/a/t/" + getThingId() + "/e/o"); }
+    inline String getTopic_datain   () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/i")      : String("/a/t/" + getThingId() + "/e/i"); }
 
     State handle_ConnectPhy();
     State handle_SyncTime();