diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
index 630163c12e18..9e16b6d69cf8 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/watchdog.py
@@ -283,7 +283,8 @@ def get_watchdog():
     """
     Return WatchdogType1 or WatchdogType2 based on system
     """
-
+    
+    utils.wait_until(lambda: os.path.exists('/run/hw-management/watchdog/main/state'), timeout=10, interval=1)
     watchdog_main_device_name = None
 
     for device in os.listdir("/dev/"):
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_watchdog.py b/platform/mellanox/mlnx-platform-api/tests/test_watchdog.py
index 68d29d38a654..6e925d594708 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_watchdog.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_watchdog.py
@@ -36,6 +36,7 @@
 
 
 class TestWatchdog:
+    @mock.patch('sonic_platform.utils.wait_until', mock.MagicMock())
     @mock.patch('sonic_platform.watchdog.is_mlnx_wd_main')
     @mock.patch('sonic_platform.watchdog.os.listdir')
     def test_get_watchdog_no_device(self, mock_listdir, mock_is_main):
@@ -50,6 +51,7 @@ def test_get_watchdog_no_device(self, mock_listdir, mock_is_main):
         mock_is_main.return_value = False
         assert get_watchdog() is None
 
+    @mock.patch('sonic_platform.utils.wait_until', mock.MagicMock())
     @mock.patch('sonic_platform.watchdog.is_mlnx_wd_main')
     @mock.patch('sonic_platform.watchdog.is_wd_type2')
     @mock.patch('sonic_platform.watchdog.os.listdir', mock.MagicMock(return_value=['watchdog1', 'watchdog2']))