diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 9b47c133705..370140a4f74 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -42,6 +42,8 @@
 
 /obj/machinery/power/solar/Destroy()
 	unset_control() //remove from control computer
+	QDEL_NULL(panel)
+	QDEL_NULL(panel_edge)
 	return ..()
 
 /obj/machinery/power/solar/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)