diff --git a/lib/graph3d/DataGroup.js b/lib/graph3d/DataGroup.js
index d3fadae3..34eeb889 100644
--- a/lib/graph3d/DataGroup.js
+++ b/lib/graph3d/DataGroup.js
@@ -35,13 +35,7 @@ function DataGroup() {
  * @param {Number}   style   Style Number
  */
 DataGroup.prototype.initializeData = function(graph3d, rawData, style) {
-  // unsubscribe from the dataTable
-  if (this.dataSet) {
-    this.dataSet.off('*', this._onChange);
-  }
-
-  if (rawData === undefined)
-    return;
+  if (rawData === undefined) return;
 
   if (Array.isArray(rawData)) {
     rawData = new DataSet(rawData);
@@ -55,8 +49,12 @@ DataGroup.prototype.initializeData = function(graph3d, rawData, style) {
     throw new Error('Array, DataSet, or DataView expected');
   }
 
-  if (data.length == 0)
-    return;
+  if (data.length == 0) return;
+
+  // unsubscribe from the dataTable
+  if (this.dataSet) {
+    this.dataSet.off('*', this._onChange);
+  }
 
   this.dataSet = rawData;
   this.dataTable = data;