diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 0cb1d4497..c901fabd5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -822,7 +822,6 @@ 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 b572b84eb..5ac742270 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -890,23 +890,6 @@ 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 31f650b3f..951c7a16a 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -51,7 +51,6 @@ 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 ce8bba6b6..e740b62d1 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 (((maptol & TOL_NIGHTS) && player->spheres <= 0) || (!(maptol & TOL_NIGHTS) && player->rings <= 0))
+	if (player->rings <= 0)
 		num_rings = 0;
 
 	if (num_rings > 32 && player->powers[pw_carry] != CR_NIGHTSFALL)