diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index dadb9a0584..52d26bb210 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -256,6 +256,10 @@ SkGpuDevice::~SkGpuDevice() {
         fContext->setRenderTarget(NULL);
     }
 
+    if (fContext->getClip() == &fClipData) {
+        fContext->setClip(NULL);
+    }
+
     SkSafeUnref(fRenderTarget);
     fContext->unref();
 }