diff --git a/code/game/g_utils.cpp b/code/game/g_utils.cpp
index 9273fad527..2be57e10a7 100644
--- a/code/game/g_utils.cpp
+++ b/code/game/g_utils.cpp
@@ -30,6 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "g_navigator.h"
 #include "b_local.h"
 #include "g_nav.h"
+#include "wp_saber.h"
 
 #define ACT_ACTIVE		qtrue
 #define ACT_INACTIVE	qfalse
@@ -911,7 +912,7 @@ void G_FreeEntity( gentity_t *ed ) {
 		if(ed->client->clientInfo.customJediSoundDir) {
 			gi.Free(ed->client->clientInfo.customJediSoundDir);
 		}
-		if(ed->client->ps.saber[0].name && gi.bIsFromZone(ed->client->ps.saber[0].name, TAG_G_ALLOC) ) {
+		/* if(ed->client->ps.saber[0].name && gi.bIsFromZone(ed->client->ps.saber[0].name, TAG_G_ALLOC) ) {
 			gi.Free(ed->client->ps.saber[0].name);
 		}
 		if(ed->client->ps.saber[0].model && gi.bIsFromZone(ed->client->ps.saber[0].model, TAG_G_ALLOC) ) {
@@ -922,7 +923,9 @@ void G_FreeEntity( gentity_t *ed ) {
 		}
 		if(ed->client->ps.saber[1].model && gi.bIsFromZone(ed->client->ps.saber[1].model, TAG_G_ALLOC) ) {
  			gi.Free(ed->client->ps.saber[1].model);
-		}
+		} */
+		WP_SaberFreeStrings(ed->client->ps.saber[0]);
+		WP_SaberFreeStrings(ed->client->ps.saber[1]);
 
 		gi.Free(ed->client);
 	}