diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 56e5e2fe18f084f3c44cfe157feedbc49c044d0f..ca353a1568b915b5f6a25dc7e98174c0b4f3a0b7 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1284,6 +1284,7 @@ be changed.
 \fB2\fR
 A DOWN node will become available for use upon registration with a
 valid configuration.  The node could have been set DOWN for any reason.
+(Disabled on Cray systems.)
 .RE
 
 .TP
diff --git a/src/common/read_config.c b/src/common/read_config.c
index f6e7b08df2d67e98953daef601016352c530f8f7..db15d904aacb3ca507eb0fd7226c3251bd738432 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -2702,6 +2702,10 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
 
 	if (!s_p_get_uint16(&conf->ret2service, "ReturnToService", hashtbl))
 		conf->ret2service = DEFAULT_RETURN_TO_SERVICE;
+#ifdef HAVE_NATIVE_CRAY
+	if (conf->ret2service > 1)
+		fatal("ReturnToService > 1 is not supported on Cray");
+#endif
 
 	s_p_get_uint16(&conf->resv_over_run, "ResvOverRun", hashtbl);