diff --git a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_EditorThemeStoreTest.kt b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_EditorThemeStoreTest.kt
index 2a2809b709..2ce7e58d89 100644
--- a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_EditorThemeStoreTest.kt
+++ b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_EditorThemeStoreTest.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.fluxc.mocked
 
+import android.os.Bundle
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.junit.Assert
@@ -46,9 +47,17 @@ class MockedStack_EditorThemeStoreTest : MockedStack_Base() {
 
         // See onEditorThemeChanged for the latch's countdown to fire.
         Assert.assertTrue(countDownLatch.await(TestUtils.DEFAULT_TIMEOUT_MS.toLong(), MILLISECONDS))
+
+        // Validate Callback
         assertNotEmpty(editorTheme)
+
+        // Validate Cache
         val cachedTheme = editorThemeStore.getEditorThemeForSite(site)
         assertNotEmpty(cachedTheme)
+
+        // Validate Bundle
+        val themeBundle = editorTheme!!.themeSupport.toBundle()
+        assertNotEmpty(themeBundle)
     }
 
     @Test
@@ -58,9 +67,17 @@ class MockedStack_EditorThemeStoreTest : MockedStack_Base() {
 
         // See onEditorThemeChanged for the latch's countdown to fire.
         Assert.assertTrue(countDownLatch.await(TestUtils.DEFAULT_TIMEOUT_MS.toLong(), MILLISECONDS))
+
+        // Validate Callback
         assertEmpty(editorTheme)
+
+        // Validate Cache
         val cachedTheme = editorThemeStore.getEditorThemeForSite(site)
         assertEmpty(cachedTheme)
+
+        // Validate Bundle
+        val themeBundle = editorTheme!!.themeSupport.toBundle()
+        assertEmpty(themeBundle)
     }
 
     private fun assertNotEmpty(theme: EditorTheme?) {
@@ -69,8 +86,22 @@ class MockedStack_EditorThemeStoreTest : MockedStack_Base() {
     }
 
     private fun assertEmpty(theme: EditorTheme?) {
-        Assert.assertTrue(theme?.themeSupport?.colors.isNullOrEmpty())
-        Assert.assertTrue(theme?.themeSupport?.gradients.isNullOrEmpty())
+        Assert.assertTrue(theme?.themeSupport?.colors == null)
+        Assert.assertTrue(theme?.themeSupport?.gradients == null)
+    }
+
+    private fun assertEmpty(theme: Bundle) {
+        val colors = theme.getSerializable("colors")
+        val gradients = theme.getSerializable("gradients")
+        Assert.assertTrue(colors == null)
+        Assert.assertTrue(gradients == null)
+    }
+
+    private fun assertNotEmpty(theme: Bundle) {
+        val colors = theme.getSerializable("colors") as ArrayList<*>
+        val gradients = theme.getSerializable("gradients") as ArrayList<*>
+        Assert.assertFalse(colors.isNullOrEmpty())
+        Assert.assertFalse(gradients.isNullOrEmpty())
     }
 
     @Suppress("unused")
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt
index cbaebca9d7..c9e628a1e2 100644
--- a/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt
+++ b/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/EditorThemeSqlUtils.kt
@@ -95,8 +95,16 @@ class EditorThemeSqlUtils {
             storedColors: List<EditorThemeElementBuilder>?,
             storedGradients: List<EditorThemeElementBuilder>?
         ): EditorTheme {
-            val colors = storedColors?.mapNotNull { it.toEditorThemeElement() }
-            val gradients = storedGradients?.mapNotNull { it.toEditorThemeElement() }
+            var colors: List<EditorThemeElement>? = null
+            if (storedColors != null && storedColors.count() > 0) {
+                colors = storedColors.mapNotNull { it.toEditorThemeElement() }
+            }
+
+            var gradients: List<EditorThemeElement>? = null
+            if (storedGradients != null && storedGradients.count() > 0) {
+                gradients = storedGradients.mapNotNull { it.toEditorThemeElement() }
+            }
+
             val editorThemeSupport = EditorThemeSupport(colors, gradients)
 
             return EditorTheme(editorThemeSupport, stylesheet, version)