diff --git a/R/as.corpus.textmeta.R b/R/as.corpus.textmeta.R
index aa453b5..8b735d6 100644
--- a/R/as.corpus.textmeta.R
+++ b/R/as.corpus.textmeta.R
@@ -47,7 +47,10 @@ as.corpus.textmeta <- function(object, docnames = "id",
   colnames(meta) <- metadoc
 
   corp <- quanteda::corpus(x = texts, docnames = id, docvars = vars, ...)
-  quanteda::metadoc(corp) <- meta
+  suppressWarnings(
+    quanteda::docvars(corp) <- 
+      cbind(quanteda::docvars(corp), quanteda::metadoc(corp))
+  )
 
   return(corp)
 }
diff --git a/R/as.textmeta.corpus.R b/R/as.textmeta.corpus.R
index 05bad61..3a59522 100644
--- a/R/as.textmeta.corpus.R
+++ b/R/as.textmeta.corpus.R
@@ -75,7 +75,7 @@ as.textmeta.corpus <- function(corpus, cols, dateFormat = "%Y-%m-%d", idCol = "i
   }
   tmpid <- meta$id
 
-  if(addMetadata){
+  if (addMetadata && length(corpus$metadata)) {
     tmp <- unlist(corpus$metadata)
     meta[, names(corpus$metadata)] <- matrix(rep(tmp, each = length(tmpid)), nrow = length(tmpid))
   }