diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 91af9df1071a52301cdf451e06cbdaa760ff06c9..9c882be20a3306351d0b731f0f78fbdc389af62f 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -1603,6 +1603,24 @@ static int _post_block_free(bg_record_t *bg_record, bool restore)
 		return SLURM_SUCCESS;
 	}
 
+	/* A bit of a sanity check to make sure blocks are being
+	   removed out of all the lists.
+	*/
+	if (blocks_are_created) {
+		if (remove_from_bg_list(bg_lists->booted, bg_record)
+		    == SLURM_SUCCESS)
+			error("block %s is being freed but hadn't been "
+			      "removed from the booted block list yet.",
+			      bg_record->bg_block_id);
+		if (remove_from_bg_list(bg_lists->job_running, bg_record)
+		    == SLURM_SUCCESS) {
+			num_unused_cpus += bg_record->cpu_cnt;
+			error("block %s is being freed but hadn't been "
+			      "removed from the running job block list yet.",
+			      bg_record->bg_block_id);
+		}
+	}
+
 	if (restore)
 		return SLURM_SUCCESS;