diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 97f8ad360c5..72e4c47f28d 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -3041,7 +3041,7 @@ static WERROR save_driver_init_2(NT_PRINTER_INFO_LEVEL *printer, NT_PRINTER_PARA
 	 * When the DEVMODE is already set on the printer, don't try to unpack it.
 	 */
 
-	if (!printer->info_2->devmode) {
+	if (!printer->info_2->devmode && param->data_len) {
 		/*
 		 * Set devmode on printer info, so entire printer initialization can be
 		 * saved to tdb.