diff --git a/Daqifi.Desktop.Test/Device/DisplayIdentifierTests.cs b/Daqifi.Desktop.Test/Device/DisplayIdentifierTests.cs
new file mode 100644
index 0000000..11db6ed
--- /dev/null
+++ b/Daqifi.Desktop.Test/Device/DisplayIdentifierTests.cs
@@ -0,0 +1,230 @@
+using Daqifi.Desktop.Device;
+using Daqifi.Desktop.Device.SerialDevice;
+using Daqifi.Desktop.Device.WiFiDevice;
+using Daqifi.Desktop.DataModel.Device;
+using System.ComponentModel;
+using System.IO.Ports;
+
+namespace Daqifi.Desktop.Test.Device;
+
+[TestClass]
+public class DisplayIdentifierTests
+{
+    #region SerialStreamingDevice Tests
+    
+    [TestMethod]
+    public void SerialStreamingDevice_DisplayIdentifier_ShouldReturnComPort()
+    {
+        // Arrange
+        const string expectedComPort = "COM3";
+        var device = new SerialStreamingDevice(expectedComPort);
+        
+        // Act
+        var displayIdentifier = device.DisplayIdentifier;
+        
+        // Assert
+        Assert.AreEqual(expectedComPort, displayIdentifier, 
+            "USB device should display COM port name");
+    }
+    
+    [TestMethod]
+    public void SerialStreamingDevice_DisplayIdentifier_ShouldReturnUsbWhenPortIsNull()
+    {
+        // Arrange
+        var device = new SerialStreamingDevice("COM1");
+        device.Port = null; // Simulate null port
+        
+        // Act
+        var displayIdentifier = device.DisplayIdentifier;
+        
+        // Assert
+        Assert.AreEqual("USB", displayIdentifier, 
+            "USB device with null port should return 'USB' as fallback");
+    }
+    
+    [TestMethod] 
+    public void SerialStreamingDevice_PropertyChanged_ShouldTriggerDisplayIdentifierUpdate()
+    {
+        // Arrange
+        var device = new SerialStreamingDevice("COM1");
+        var propertyChangedFired = false;
+        string? changedPropertyName = null;
+        
+        device.PropertyChanged += (sender, e) =>
+        {
+            if (e.PropertyName == nameof(device.DisplayIdentifier))
+            {
+                propertyChangedFired = true;
+                changedPropertyName = e.PropertyName;
+            }
+        };
+        
+        // Act
+        device.Port = new System.IO.Ports.SerialPort("COM5");
+        
+        // Assert
+        Assert.IsTrue(propertyChangedFired, "PropertyChanged should fire for DisplayIdentifier when Port changes");
+        Assert.AreEqual(nameof(device.DisplayIdentifier), changedPropertyName);
+        Assert.AreEqual("COM5", device.DisplayIdentifier);
+    }
+    
+    [TestMethod]
+    public void SerialStreamingDevice_ConnectionType_ShouldBeUsb()
+    {
+        // Arrange
+        var device = new SerialStreamingDevice("COM1");
+        
+        // Act & Assert
+        Assert.AreEqual(ConnectionType.Usb, device.ConnectionType,
+            "SerialStreamingDevice should have USB connection type");
+    }
+    
+    #endregion
+    
+    #region DaqifiStreamingDevice (WiFi) Tests
+    
+    [TestMethod]
+    public void DaqifiStreamingDevice_DisplayIdentifier_ShouldReturnIpAddress()
+    {
+        // Arrange
+        const string expectedIpAddress = "192.168.1.100";
+        var deviceInfo = new DeviceInfo
+        {
+            DeviceName = "Test Device",
+            IpAddress = expectedIpAddress,
+            MacAddress = "00:11:22:33:44:55",
+            DeviceSerialNo = "12345",
+            DeviceVersion = "1.0.0",
+            Port = 1234,
+            IsPowerOn = true
+        };
+        var device = new DaqifiStreamingDevice(deviceInfo);
+        
+        // Act
+        var displayIdentifier = device.DisplayIdentifier;
+        
+        // Assert
+        Assert.AreEqual(expectedIpAddress, displayIdentifier,
+            "WiFi device should display IP address");
+    }
+    
+    [TestMethod]
+    public void DaqifiStreamingDevice_ConnectionType_ShouldBeWifi()
+    {
+        // Arrange
+        var deviceInfo = new DeviceInfo
+        {
+            DeviceName = "Test Device",
+            IpAddress = "192.168.1.100",
+            MacAddress = "00:11:22:33:44:55",
+            DeviceSerialNo = "12345",
+            DeviceVersion = "1.0.0",
+            Port = 1234,
+            IsPowerOn = true
+        };
+        var device = new DaqifiStreamingDevice(deviceInfo);
+        
+        // Act & Assert
+        Assert.AreEqual(ConnectionType.Wifi, device.ConnectionType,
+            "DaqifiStreamingDevice should have WiFi connection type");
+    }
+    
+    [TestMethod]
+    public void DaqifiStreamingDevice_DisplayIdentifier_ShouldHandleEmptyIpAddress()
+    {
+        // Arrange
+        var deviceInfo = new DeviceInfo
+        {
+            DeviceName = "Test Device",
+            IpAddress = "",
+            MacAddress = "00:11:22:33:44:55",
+            DeviceSerialNo = "12345",
+            DeviceVersion = "1.0.0",
+            Port = 1234,
+            IsPowerOn = true
+        };
+        var device = new DaqifiStreamingDevice(deviceInfo);
+        
+        // Act
+        var displayIdentifier = device.DisplayIdentifier;
+        
+        // Assert
+        Assert.AreEqual("", displayIdentifier,
+            "WiFi device with empty IP address should return empty string");
+    }
+    
+    [TestMethod]
+    public void DaqifiStreamingDevice_PropertyChanged_ShouldTriggerDisplayIdentifierUpdate()
+    {
+        // Arrange
+        var deviceInfo = new DeviceInfo
+        {
+            DeviceName = "Test Device",
+            IpAddress = "192.168.1.100", 
+            MacAddress = "00:11:22:33:44:55",
+            DeviceSerialNo = "12345",
+            DeviceVersion = "1.0.0",
+            Port = 1234,
+            IsPowerOn = true
+        };
+        var device = new DaqifiStreamingDevice(deviceInfo);
+        var propertyChangedFired = false;
+        string? changedPropertyName = null;
+        
+        device.PropertyChanged += (sender, e) =>
+        {
+            if (e.PropertyName == nameof(device.DisplayIdentifier))
+            {
+                propertyChangedFired = true;
+                changedPropertyName = e.PropertyName;
+            }
+        };
+        
+        // Act
+        device.IpAddress = "192.168.1.200";
+        
+        // Assert
+        Assert.IsTrue(propertyChangedFired, "PropertyChanged should fire for DisplayIdentifier when IpAddress changes");
+        Assert.AreEqual(nameof(device.DisplayIdentifier), changedPropertyName);
+        Assert.AreEqual("192.168.1.200", device.DisplayIdentifier);
+    }
+    
+    #endregion
+    
+    #region Edge Cases
+    
+    [TestMethod]
+    public void DisplayIdentifier_UnknownConnectionType_ShouldReturnUnknown()
+    {
+        // Arrange - Create a mock device with unknown connection type
+        var mockDevice = new TestStreamingDevice(null);
+        
+        // Act
+        var displayIdentifier = mockDevice.DisplayIdentifier;
+        
+        // Assert
+        Assert.AreEqual("Unknown", displayIdentifier,
+            "Device with unknown connection type should return 'Unknown'");
+    }
+    
+    #endregion
+}
+
+/// <summary>
+/// Test implementation of AbstractStreamingDevice for testing purposes
+/// </summary>
+public class TestStreamingDevice : AbstractStreamingDevice
+{
+    private readonly ConnectionType? _connectionType;
+    
+    public TestStreamingDevice(ConnectionType? connectionType)
+    {
+        _connectionType = connectionType;
+    }
+    
+    public override ConnectionType ConnectionType => _connectionType ?? (ConnectionType)99; // Invalid enum value
+    
+    public override bool Connect() => true;
+    public override bool Disconnect() => true;
+    public override bool Write(string command) => true;
+}
\ No newline at end of file
diff --git a/Daqifi.Desktop/Device/AbstractStreamingDevice.cs b/Daqifi.Desktop/Device/AbstractStreamingDevice.cs
index ffaf8da..f3be6a4 100644
--- a/Daqifi.Desktop/Device/AbstractStreamingDevice.cs
+++ b/Daqifi.Desktop/Device/AbstractStreamingDevice.cs
@@ -71,7 +71,41 @@ private enum MessageHandlerType
 
     public string DeviceVersion { get; set; }
 
-    public string IpAddress { get; set; } = string.Empty;
+    private string _ipAddress = string.Empty;
+    
+    public string IpAddress 
+    { 
+        get => _ipAddress; 
+        set 
+        { 
+            if (_ipAddress != value)
+            {
+                _ipAddress = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(DisplayIdentifier));
+            }
+        } 
+    }
+
+    /// <summary>
+    /// Gets the appropriate display identifier for this device based on connection type.
+    /// Returns COM port for USB devices, IP address for WiFi devices.
+    /// </summary>
+    public virtual string DisplayIdentifier => ConnectionType switch
+    {
+        ConnectionType.Usb => GetUsbDisplayIdentifier(),
+        ConnectionType.Wifi => IpAddress,
+        _ => "Unknown"
+    };
+
+    /// <summary>
+    /// Gets the COM port identifier for USB devices. Override in derived classes.
+    /// </summary>
+    /// <returns>COM port name for USB devices</returns>
+    protected virtual string GetUsbDisplayIdentifier()
+    {
+        return "USB";
+    }
 
     // Removed original StreamingFrequency property definition
 
diff --git a/Daqifi.Desktop/Device/IStreamingDevice.cs b/Daqifi.Desktop/Device/IStreamingDevice.cs
index bb6537e..71b4d9a 100644
--- a/Daqifi.Desktop/Device/IStreamingDevice.cs
+++ b/Daqifi.Desktop/Device/IStreamingDevice.cs
@@ -46,6 +46,12 @@ public interface IStreamingDevice : IDevice
     bool IsFirmwareOutdated { get; set; }
     string IpAddress { get; set; }
     int StreamingFrequency { get; set; }
+    
+    /// <summary>
+    /// Gets the appropriate display identifier for this device based on connection type.
+    /// Returns COM port for USB devices, IP address for WiFi devices.
+    /// </summary>
+    string DisplayIdentifier { get; }
     IMessageConsumer MessageConsumer { get; set; }
     IMessageProducer MessageProducer { get; set; }
     List<IChannel> DataChannels { get; set; }
diff --git a/Daqifi.Desktop/Device/SerialDevice/SerialStreamingDevice.cs b/Daqifi.Desktop/Device/SerialDevice/SerialStreamingDevice.cs
index 59f553e..344246e 100644
--- a/Daqifi.Desktop/Device/SerialDevice/SerialStreamingDevice.cs
+++ b/Daqifi.Desktop/Device/SerialDevice/SerialStreamingDevice.cs
@@ -9,7 +9,22 @@ namespace Daqifi.Desktop.Device.SerialDevice;
 public class SerialStreamingDevice : AbstractStreamingDevice, IFirmwareUpdateDevice
 {
     #region Properties
-    public SerialPort Port { get; set; }
+    private SerialPort? _port;
+    
+    public SerialPort? Port 
+    { 
+        get => _port; 
+        set 
+        { 
+            if (_port != value)
+            {
+                _port = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(DisplayIdentifier));
+            }
+        } 
+    }
+    
     public override ConnectionType ConnectionType => ConnectionType.Usb;
     #endregion
 
@@ -332,5 +347,21 @@ public void ForceBootloader()
     {
         MessageProducer.Send(ScpiMessageProducer.ForceBootloader);
     }
+
+    /// <summary>
+    /// Returns the COM port name for this USB device
+    /// </summary>
+    protected override string GetUsbDisplayIdentifier()
+    {
+        try
+        {
+            var name = Port?.PortName;
+            return string.IsNullOrWhiteSpace(name) ? "USB" : name;
+        }
+        catch
+        {
+            return "USB";
+        }
+    }
     #endregion
 }
\ No newline at end of file
diff --git a/Daqifi.Desktop/MainWindow.xaml b/Daqifi.Desktop/MainWindow.xaml
index 3940963..af3d971 100644
--- a/Daqifi.Desktop/MainWindow.xaml
+++ b/Daqifi.Desktop/MainWindow.xaml
@@ -703,7 +703,7 @@
                                                         </Grid.ColumnDefinitions>
                                                         <StackPanel   Grid.Column="0" Grid.Row="0" Margin="5"  Orientation="Vertical">
                                                             <Label Content="{Binding Name}"  Padding="0"/>
-                                                            <Label Content="{Binding IpAddress}" FontSize="10" Padding="0"/>
+                                                            <Label Content="{Binding DisplayIdentifier}" FontSize="10" Padding="0"/>
                                                             <Label Content="{Binding DeviceSerialNo}" FontSize="10"  Padding="0"/>
                                                             <TextBlock FontSize="10" Padding="0" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Label}}">
                                                                     <Run Text="Firmware version :" />