diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f3fb1f6ae..dbb0b0ff5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -822,6 +822,7 @@ void D_RegisterClientCommands(void)
 	COM_AddCommand("getallemeralds", Command_Getallemeralds_f);
 	COM_AddCommand("resetemeralds", Command_Resetemeralds_f);
 	COM_AddCommand("setrings", Command_Setrings_f);
+	COM_AddCommand("setspheres", Command_Setspheres_f);
 	COM_AddCommand("setlives", Command_Setlives_f);
 	COM_AddCommand("setcontinues", Command_Setcontinues_f);
 	COM_AddCommand("devmode", Command_Devmode_f);
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 5ac742270..b572b84eb 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -890,6 +890,23 @@ void Command_Setrings_f(void)
 	}
 }
 
+void Command_Setspheres_f(void)
+{
+	REQUIRE_INLEVEL;
+	REQUIRE_SINGLEPLAYER;
+	REQUIRE_NOULTIMATE;
+	REQUIRE_PANDORA;
+
+	if (COM_Argc() > 1)
+	{
+		// P_GivePlayerRings does value clamping
+		players[consoleplayer].spheres = 0;
+		P_GivePlayerSpheres(&players[consoleplayer], atoi(COM_Argv(1)));
+
+		G_SetGameModified(multiplayer);
+	}
+}
+
 void Command_Setlives_f(void)
 {
 	REQUIRE_INLEVEL;
diff --git a/src/m_cheat.h b/src/m_cheat.h
index 951c7a16a..31f650b3f 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -51,6 +51,7 @@ void Command_Savecheckpoint_f(void);
 void Command_Getallemeralds_f(void);
 void Command_Resetemeralds_f(void);
 void Command_Setrings_f(void);
+void Command_Setspheres_f(void);
 void Command_Setlives_f(void);
 void Command_Setcontinues_f(void);
 void Command_Devmode_f(void);
diff --git a/src/p_inter.c b/src/p_inter.c
index e740b62d1..ce8bba6b6 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3409,7 +3409,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 		return;
 
 	// If no health, don't spawn ring!
-	if (player->rings <= 0)
+	if (((maptol & TOL_NIGHTS) && player->spheres <= 0) || (!(maptol & TOL_NIGHTS) && player->rings <= 0))
 		num_rings = 0;
 
 	if (num_rings > 32 && player->powers[pw_carry] != CR_NIGHTSFALL)