diff --git a/boot/boot.js b/boot/boot.js
index 0b343fec3..30a2caa35 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -915,8 +915,12 @@ $tw.Wiki = function(options) {
 	// Iterate through all the shadows and then the tiddlers
 	this.eachShadowPlusTiddlers = function(callback) {
 		for(var title in shadowTiddlers) {
-			var shadowInfo = shadowTiddlers[title];
-			callback(shadowInfo.tiddler,title);
+			if(Object.prototype.hasOwnProperty.call(tiddlers,title)) {
+				callback(tiddlers[title],title);
+			} else {
+				var shadowInfo = shadowTiddlers[title];
+				callback(shadowInfo.tiddler,title);
+			}
 		}
 		for(var title in tiddlers) {
 			if(!Object.prototype.hasOwnProperty.call(shadowTiddlers,title)) {
diff --git a/editions/tw5.com/tiddlers/Release 5.0.12beta.tid b/editions/tw5.com/tiddlers/Release 5.0.12beta.tid
new file mode 100644
index 000000000..a14554549
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Release 5.0.12beta.tid	
@@ -0,0 +1,10 @@
+created: 20140517010234142
+modified: 20140517010234142
+tags: releasenote
+title: Release 5.0.12-beta
+type: text/vnd.tiddlywiki
+released: 201405170102
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.11-beta...v5.0.12-beta]]//
+
+This is an emergency release that fixes a single significant bug with shadow tiddler handling in 5.0.11. See the [[discussion thread|https://groups.google.com/d/topic/tiddlywiki/pNxZsSCVp7c/discussion]] for more details.