diff --git a/src/m_misc.c b/src/m_misc.c
index 21cc1287d..97c22b731 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1763,6 +1763,12 @@ void M_MinimapGenerate(void)
 		return;
 	}
 
+	if (automapactive)
+	{
+		CONS_Alert(CONS_ERROR, "The automap is active! Please deactivate it and try again.\n");
+		return;
+	}
+
 	minigen = AM_MinimapGenerate(wh);
 
 	if (minigen == NULL || minigen->buf == NULL)