diff --git a/src/utils/base64.c b/src/utils/base64.c
index 3407949ff..0eadb8142 100644
--- a/src/utils/base64.c
+++ b/src/utils/base64.c
@@ -115,7 +115,7 @@ unsigned char * base64_decode(const unsigned char *src, size_t len,
 			count++;
 	}
 
-	if (count % 4)
+	if (count == 0 || count % 4)
 		return NULL;
 
 	olen = count / 4 * 3;