diff --git a/drivers/gpu/msm/kgsl_snapshot.c b/drivers/gpu/msm/kgsl_snapshot.c
index 0ccadd55908a..d3aa3de2bc7c 100644
--- a/drivers/gpu/msm/kgsl_snapshot.c
+++ b/drivers/gpu/msm/kgsl_snapshot.c
@@ -678,8 +678,6 @@ static void kgsl_device_snapshot_atomic(struct kgsl_device *device)
 	struct kgsl_snapshot *snapshot;
 	phys_addr_t pa;
 
-	device->snapshot_atomic = true;
-
 	if (device->snapshot && device->force_panic)
 		return;
 
@@ -703,6 +701,7 @@ static void kgsl_device_snapshot_atomic(struct kgsl_device *device)
 	if (snapshot == NULL)
 		return;
 
+	device->snapshot_atomic = true;
 	INIT_LIST_HEAD(&snapshot->obj_list);
 	INIT_LIST_HEAD(&snapshot->cp_list);