diff --git a/CHANGES.md b/CHANGES.md
index 4be8fc5a5..ed785a5d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,8 @@ This document outlines changes since 0.3.0.  For older changelogs, see the
 
 * Updated the README and fixed the redirect in `test/intern/runTests.html` to
   reference the correct path where intern-geezer installs to as of Intern 1.2.
+* Fixed a regression in `_StoreMixin` (affecting `OnDemandList` and `Pagination`)
+  where setting `store` to `null` would cause an error. (#688, thanks kilink)
 
 # 0.3.9
 
diff --git a/_StoreMixin.js b/_StoreMixin.js
index e542fe8ec..42438fbad 100644
--- a/_StoreMixin.js
+++ b/_StoreMixin.js
@@ -107,7 +107,7 @@ function(kernel, declare, lang, Deferred, listen, aspect, put){
 				this._notifyHandle.remove();
 				delete this._notifyHandle;
 			}
-			if(typeof store.notify === "function"){
+			if(store && typeof store.notify === "function"){
 				this._notifyHandle = aspect.after(store, "notify",
 					lang.hitch(this, "_onNotify"), true);
 			}