diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp
index 4bc7bf9a53..5c85e8ac28 100644
--- a/src/system/kernel/fs/fd.cpp
+++ b/src/system/kernel/fs/fd.cpp
@@ -518,7 +518,10 @@ fd_ioctl(bool kernelFD, int fd, uint32 op, void* buffer, size_t length)
 	if (descriptor->ops->fd_ioctl)
 		status = descriptor->ops->fd_ioctl(descriptor, op, buffer, length);
 	else
-		status = B_NOT_SUPPORTED;
+		status = B_DEV_INVALID_IOCTL;
+
+	if (status == B_DEV_INVALID_IOCTL)
+		status = ENOTTY;
 
 	put_fd(descriptor);
 	return status;
diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp
index 4f3262ff0c..b189db68b4 100644
--- a/src/system/kernel/fs/vfs.cpp
+++ b/src/system/kernel/fs/vfs.cpp
@@ -5858,7 +5858,7 @@ common_ioctl(struct file_descriptor* descriptor, uint32 op, void* buffer,
 	if (HAS_FS_CALL(vnode, ioctl))
 		return FS_CALL(vnode, ioctl, descriptor->cookie, op, buffer, length);
 
-	return B_NOT_SUPPORTED;
+	return B_DEV_INVALID_IOCTL;
 }