diff --git a/core/modules/widgets/list.js b/core/modules/widgets/list.js
index ba2e0f129..3e1b5f864 100755
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@@ -150,13 +150,14 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 			// Check for a <$list-item> widget
 			if(this.explicitListTemplate) {
 				templateTree = this.explicitListTemplate;
-			} else {
+			} else if (!this.explicitEmptyTemplate) {
 				templateTree = this.parseTreeNode.children;
 			}
-		} else {
+		}
+		if(!templateTree) {
 			// Default template is a link to the title
 			templateTree = [{type: "element", tag: this.parseTreeNode.isBlock ? "div" : "span", children: [{type: "link", attributes: {to: {type: "string", value: title}}, children: [
-					{type: "text", text: title}
+				{type: "text", text: title}
 			]}]}];
 		}
 	}
diff --git a/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid b/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid
new file mode 100644
index 000000000..40fb2f07b
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid
@@ -0,0 +1,26 @@
+title: ListWidget/WithMissingTemplate
+description: List widget with explicit templates
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
++
+title: Output
+
+\whitespace trim
+
+\procedure test(filter)
+<$list filter=<<filter>>>
+	<$list-empty>
+		None!
+	</$list-empty>
+</$list>
+\end
+
+<<test "1 2 3">>
+
+<<test "">>
+
++
+title: ExpectedResult
+
+<p><span><a class="tc-tiddlylink tc-tiddlylink-missing" href="#1">1</a></span><span><a class="tc-tiddlylink tc-tiddlylink-missing" href="#2">2</a></span><span><a class="tc-tiddlylink tc-tiddlylink-missing" href="#3">3</a></span></p><p>None!</p>
\ No newline at end of file