diff --git a/R/moduleHeatmap.R b/R/moduleHeatmap.R
index e9d83ed1..3343535b 100644
--- a/R/moduleHeatmap.R
+++ b/R/moduleHeatmap.R
@@ -87,7 +87,9 @@
 #' @param unit Passed to \link[multipanelfigure]{multi_panel_figure}. Single
 #'  character object defining the unit of all dimensions defined.
 #' @param ... Additional parameters passed to \link[ComplexHeatmap]{Heatmap}.
-#' @return A \link[multipanelfigure]{multi_panel_figure} object.
+#' @return A \link[multipanelfigure]{multi_panel_figure} object if plotting
+#'  more than one module heatmaps. Otherwise a
+#'  \link[ComplexHeatmap]{HeatmapList} object is returned.
 #' @importFrom methods .hasSlot
 #' @importFrom multipanelfigure multi_panel_figure
 #' @export
@@ -155,6 +157,12 @@ setMethod("moduleHeatmap",
             featureModule <- sort(unique(celdaModules(x)))
         }
 
+        if (length(featureModule) == 1) {
+            returnHeatmap <- TRUE
+        } else {
+            returnHeatmap <- FALSE
+        }
+
         if (moduleLabel == "auto") {
             moduleLabel <- paste0("Module ", as.character(featureModule))
         } else if (length(moduleLabel) != length(unique(celdaModules(x,
@@ -227,25 +235,30 @@ setMethod("moduleHeatmap",
                 ... = ...)
         }
 
-        ncol <- floor(sqrt(length(plts)))
-        nrow <- ceiling(length(plts) / ncol)
+        if (isTRUE(returnHeatmap)) {
+            return(plts[[1]])
+        } else {
+            ncol <- floor(sqrt(length(plts)))
+            nrow <- ceiling(length(plts) / ncol)
 
-        for (i in seq(length(plts))) {
-            plts[[i]] <- grid::grid.grabExpr(ComplexHeatmap::draw(plts[[i]]),
-                wrap.grobs = TRUE)
-        }
+            for (i in seq(length(plts))) {
+                plts[[i]] <- grid::grid.grabExpr(
+                    ComplexHeatmap::draw(plts[[i]]),
+                    wrap.grobs = TRUE)
+            }
 
-        figure <- multipanelfigure::multi_panel_figure(columns = ncol,
-            rows = nrow,
-            width = width,
-            height = height,
-            unit = unit)
+            figure <- multipanelfigure::multi_panel_figure(columns = ncol,
+                rows = nrow,
+                width = width,
+                height = height,
+                unit = unit)
 
-        for (i in seq(length(plts))) {
-            figure <- suppressMessages(multipanelfigure::fill_panel(figure,
-                plts[[i]], label = ""))
+            for (i in seq(length(plts))) {
+                figure <- suppressMessages(multipanelfigure::fill_panel(figure,
+                    plts[[i]], label = ""))
+            }
+            suppressWarnings(return(figure))
         }
-        suppressWarnings(return(figure))
     }
 )
 
diff --git a/man/moduleHeatmap.Rd b/man/moduleHeatmap.Rd
index 689ef894..faca6ba3 100644
--- a/man/moduleHeatmap.Rd
+++ b/man/moduleHeatmap.Rd
@@ -143,7 +143,9 @@ height of the output figure.}
 character object defining the unit of all dimensions defined.}
 }
 \value{
-A \link[multipanelfigure]{multi_panel_figure} object.
+A \link[multipanelfigure]{multi_panel_figure} object if plotting
+ more than one module heatmaps. Otherwise a
+ \link[ComplexHeatmap]{HeatmapList} object is returned.
 }
 \description{
 Renders a heatmap for selected \code{featureModule}. Cells are