diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index cf83140b8fff..e956ed45856e 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -2432,7 +2432,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
     QString lastUsedFile = settings.value( "/UI/lastSaveAsSvgFile", "qgis.svg" ).toString();
     QFileInfo file( lastUsedFile );
 
-    if ( atlasMap->enabled() )
+    if ( atlasMap->enabled() && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
     {
       outputFileName = QDir( file.path() ).filePath( atlasMap->currentFilename() ) + ".svg";
     }