diff --git a/common/cmd_flashwrite.c b/common/cmd_flashwrite.c
index d967e3c767..14220a5b14 100644
--- a/common/cmd_flashwrite.c
+++ b/common/cmd_flashwrite.c
@@ -45,6 +45,7 @@ extern struct sdhci_host mmc_host;
 #define HEADER_VERSION 4
 
 #define SHA1_SIG_LEN 41
+#define SZ_1M 0x00100000
 
 struct header {
 	unsigned magic[2];
@@ -448,6 +449,12 @@ char * const argv[])
 #ifdef CONFIG_IPQ_JFFS2_CLEANMARKER
 		if (write_cleanmarker) {
 			file_size = ALIGN(file_size, sfi->flash_block_size);
+			if ( part_size - file_size < SZ_1M) {
+				printf("Skipping clean marker as space is less 0x%x \n",
+							part_size - file_size);
+				goto exit;
+			}
+
 			printf("Adding clean markers in rootfs_data\n");
 			setenv("stdout", "nulldev");
 			for (j = 0; j < part_size - file_size;
diff --git a/include/configs/ipq5332.h b/include/configs/ipq5332.h
index d2cca64871..5bdb1a861b 100644
--- a/include/configs/ipq5332.h
+++ b/include/configs/ipq5332.h
@@ -105,6 +105,7 @@
 #ifdef CONFIG_IPQ_TINY
 #define CONFIG_SYS_TEXT_BASE			0x4A450000
 #define CONFIG_SYS_LOAD_ADDR                    (CONFIG_SYS_SDRAM_BASE + (64 << 20))
+#define	CONFIG_IPQ_JFFS2_CLEANMARKER
 #else
 #define CONFIG_SYS_TEXT_BASE			0x4A400000
 #define CONFIG_SYS_LOAD_ADDR                    (CONFIG_SYS_SDRAM_BASE + (256 << 20))
@@ -453,7 +454,6 @@ extern loff_t board_env_size;
 #define CONFIG_DISABLE_KERNEL64
 #define CONFIG_CMD_DISABLE_EXECTZT
 #define CONFIG_DISABLE_RAMDISK
-#define	CONFIG_IPQ_JFFS2_CLEANMARKER
 #undef CONFIG_GZIP
 #undef CONFIG_ZLIB
 #else