diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 39022b9b9c7046bda3c15decff66fd8a48ad68a0..4d78d63471867f203503fb59a2681120daa0c6f1 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -347,7 +347,7 @@ static void _opt_default()
 
 	for (i=0; i<HIGHEST_DIMENSIONS; i++) {
 		opt.conn_type[i]    = (uint16_t) NO_VAL;
-		opt.geometry[i]	    = (uint16_t) NO_VAL;
+		opt.geometry[i]	    = 0;
 	}
 	opt.reboot          = false;
 	opt.no_rotate	    = false;
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 678b7484359629809f5e1f57169e87fbb3a8bb66..37675e8f392afb487c66fc69e4e420b20c11e737 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -358,7 +358,7 @@ static void _opt_default()
 
 	for (i=0; i<HIGHEST_DIMENSIONS; i++) {
 		opt.conn_type[i]    = (uint16_t) NO_VAL;
-		opt.geometry[i]	    = (uint16_t) NO_VAL;
+		opt.geometry[i]	    = 0;
 	}
 	opt.reboot          = false;
 	opt.no_rotate	    = false;
diff --git a/src/srun/libsrun/opt.c b/src/srun/libsrun/opt.c
index db3d9a6b41cab33b6b496aabd4a9a62e3fcc07fc..b731dc3f784fb900051fb11832dd8256720a4856 100644
--- a/src/srun/libsrun/opt.c
+++ b/src/srun/libsrun/opt.c
@@ -477,7 +477,7 @@ static void _opt_default()
 
 	for (i=0; i<HIGHEST_DIMENSIONS; i++) {
 		opt.conn_type[i]    = (uint16_t) NO_VAL;
-		opt.geometry[i]	    = (uint16_t) NO_VAL;
+		opt.geometry[i]	    = 0;
 	}
 	opt.reboot          = false;
 	opt.no_rotate	    = false;