diff --git a/CliClient/tests/HtmlToMd.js b/CliClient/tests/HtmlToMd.js
index d7c7a05d48..810c4d9217 100644
--- a/CliClient/tests/HtmlToMd.js
+++ b/CliClient/tests/HtmlToMd.js
@@ -34,7 +34,7 @@ describe('HtmlToMd', function() {
 			const htmlPath = basePath + '/' + htmlFilename;
 			const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
 
-			// if (htmlFilename !== 'list2.html') continue;
+			// if (htmlFilename !== 'list4.html') continue;
 
 			const html = await shim.fsDriver().readFile(htmlPath);
 			const expectedMd = await shim.fsDriver().readFile(mdPath);
diff --git a/CliClient/tests/html_to_md/list4.html b/CliClient/tests/html_to_md/list4.html
index 27e878092c..945f3df348 100644
--- a/CliClient/tests/html_to_md/list4.html
+++ b/CliClient/tests/html_to_md/list4.html
@@ -1,11 +1,11 @@
 <ul>
 	<li>
-		<figure style="height:551px;">
+		<div style="height:551px;">
 			<div class="image" style="background-image:url('https://cdn.arstechnica.net/wp-content/uploads/2018/05/2018050719551800-9A1517382E5F6AE0CEFC2F883445C47F-980x551.jpg'); background-color:#000"></div>
-			<figcaption id="caption-1308165">
+			<div id="caption-1308165">
 	      		<span class="icon caption-arrow icon-drop-indicator"></span>
 				<div class="caption">The Kit won't work without a Joy-Con infrared camera looking in.</div>
-			</figcaption>
-		</figure>
+			</div>
+		</div>
 	</li>
 </ul>
\ No newline at end of file
diff --git a/ReactNativeClient/lib/import-enex-md-gen.js b/ReactNativeClient/lib/import-enex-md-gen.js
index 3a0bdc3f30..76e2f7b6d1 100644
--- a/ReactNativeClient/lib/import-enex-md-gen.js
+++ b/ReactNativeClient/lib/import-enex-md-gen.js
@@ -747,6 +747,11 @@ function enexXmlToMdArray(stream, resources, options = {}) {
 			warningsTags: [],
 		};
 
+		// In some cases white space should be ignored. For example, this:
+		// <ul>
+		//     <li>item</li>
+		// <ul>
+		// The whitespace between <ul> and <li> should not appear in the markdown document
 		const ignoreWhiteSpace = () => {
 			return state.ignoreWhiteSpace.length ? state.ignoreWhiteSpace[state.ignoreWhiteSpace.length-1] : false;
 		}
@@ -1051,6 +1056,18 @@ function enexXmlToMdArray(stream, resources, options = {}) {
 				state.lists.pop();
 			} else if (n === 'li') {
 				state.ignoreWhiteSpace.pop();
+
+				// Once the LI tag is closed, go back to tokens that were added and remove and newline or block delimiter
+				// since the LI needs to be one line only to work.
+				for (let i = section.lines.length - 1; i >= 0; i--) {
+					const line = section.lines[i];
+					if ([BLOCK_OPEN, BLOCK_CLOSE, NEWLINE, NEWLINE_MERGED, SPACE].indexOf(line) >= 0 || !line) {
+						section.lines.splice(i, 1);
+					} else if (line === '- ') {
+						break;
+					}
+				}
+
 				section.lines.push(BLOCK_CLOSE);
 			} else if (isStrongTag(n)) {
 				section.lines.push("**");