diff --git a/source/libsmb/errormap.c b/source/libsmb/errormap.c
index a5e922fd5c8..cb5e8311cad 100644
--- a/source/libsmb/errormap.c
+++ b/source/libsmb/errormap.c
@@ -779,11 +779,7 @@ static const struct {
 	{ERRHRD,	ERRlock,	NT_STATUS_FILE_LOCK_CONFLICT},
 	{ERRHRD,	ERRwrongdisk,	NT_STATUS_WRONG_VOLUME},
 	{ERRHRD,	38,	NT_STATUS_END_OF_FILE},
-#if defined(WITH_QUOTAS) && defined(EDQUOT)
-	{ERRHRD,	ERRdiskfull,	NT_STATUS_QUOTA_EXCEEDED},
-#else
 	{ERRHRD,	ERRdiskfull,	NT_STATUS_DISK_FULL},
-#endif
 	{ERRHRD,	50,	NT_STATUS_CTL_FILE_NOT_SUPPORTED},
 	{ERRHRD,	51,	NT_STATUS_REMOTE_NOT_LISTENING},
 	{ERRHRD,	52,	NT_STATUS_DUPLICATE_NAME},
@@ -1526,7 +1522,7 @@ const struct unix_error_map unix_dos_nt_errmap[] = {
 	{ EISDIR, ERRDOS, ERRnoaccess, NT_STATUS_FILE_IS_A_DIRECTORY},
 	{ EMLINK, ERRDOS, ERRgeneral, NT_STATUS_TOO_MANY_LINKS },
 #ifdef EDQUOT
-	{ EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_QUOTA_EXCEEDED },
+	{ EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */
 #endif
 #ifdef ENOTEMPTY
 	{ ENOTEMPTY, ERRDOS, ERRnoaccess, NT_STATUS_DIRECTORY_NOT_EMPTY },