diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 007a6d8..0edc36f 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -745,6 +745,10 @@ retry:
                bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
                bo_gem->stride = 0;
 
+               /* drm_intel_gem_bo_free calls DRMLISTDEL for an
+                  uninitialized list, so better set the list head
+                  here */
+               DRMINITLISTHEAD(&bo_gem->vma_list);
                if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
                                                         tiling_mode,
                                                         stride)) {
@@ -753,7 +757,6 @@ retry:
                }
 
                DRMINITLISTHEAD(&bo_gem->name_list);
-               DRMINITLISTHEAD(&bo_gem->vma_list);
        }
 
        bo_gem->name = name;