diff --git a/runtime/os_interface/linux/device_factory_linux.cpp b/runtime/os_interface/linux/device_factory_linux.cpp
index 835377a069..390b84bee4 100644
--- a/runtime/os_interface/linux/device_factory_linux.cpp
+++ b/runtime/os_interface/linux/device_factory_linux.cpp
@@ -31,7 +31,7 @@ bool DeviceFactory::getDevices(size_t &numDevices, ExecutionEnvironment &executi
     executionEnvironment.prepareRootDeviceEnvironments(static_cast<uint32_t>(numRootDevices));
 
     for (auto rootDeviceIndex = 0u; rootDeviceIndex < numRootDevices; rootDeviceIndex++) {
-        Drm *drm = Drm::create(rootDeviceIndex);
+        Drm *drm = Drm::create(devNum);
         if (!drm) {
             return false;
         }
diff --git a/unit_tests/os_interface/linux/drm_neo_create.cpp b/unit_tests/os_interface/linux/drm_neo_create.cpp
index b0b331ef9a..79db81ce36 100644
--- a/unit_tests/os_interface/linux/drm_neo_create.cpp
+++ b/unit_tests/os_interface/linux/drm_neo_create.cpp
@@ -45,10 +45,16 @@ void popDrmMock() { drmMockStack.pop_back(); }
 Drm::~Drm() { fd = -1; }
 
 Drm *Drm::get(int32_t deviceOrdinal) {
+    // We silently skip deviceOrdinal
+    EXPECT_EQ(deviceOrdinal, 0);
+
     return drmMockStack[drmMockStack.size() - 1];
 }
 
 Drm *Drm::create(int32_t deviceOrdinal) {
+    // We silently skip deviceOrdinal
+    EXPECT_EQ(deviceOrdinal, 0);
+
     return drmMockStack[drmMockStack.size() - 1];
 }