diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h
index e5ba8ffe7..e2a014024 100644
--- a/Engine/source/console/console.h
+++ b/Engine/source/console/console.h
@@ -161,16 +161,29 @@ class ConsoleValue
 
    TORQUE_FORCEINLINE void cleanupData()
    {
-      if (hasAllocatedData())
+      switch (type)
+      {
+      case ConsoleValueType::cvConsoleValueType:
+         if (ct)
+         {
+            delete ct;
+            ct = nullptr;
+         }
+         break;
+      case ConsoleValueType::cvString:
+         if (s && s != StringTable->EmptyString())
+            dFree(s);
+         break;
+      default:
+         break;
+      }
+
+      if (data != NULL)
       {
          dFree(data);
          data = NULL;
       }
-      else if (type == ConsoleValueType::cvString)
-      {
-         if (s != StringTable->EmptyString())
-            dFree(s);
-      }
+
       type = ConsoleValueType::cvNULL;
    }