diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index f99ff7265b..a98492bd5d 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -729,10 +729,13 @@ bool SCH_EDIT_FRAME::SaveProject()
 
     Pgm().GetSettingsManager().SaveProject();
 
-    WX_STRING_REPORTER backupReporter( &msg );
+    if( !Kiface().IsSingle() )
+    {
+        WX_STRING_REPORTER backupReporter( &msg );
 
-    if( !GetSettingsManager()->TriggerBackupIfNeeded( backupReporter ) )
-        SetStatusText( msg, 0 );
+        if( !GetSettingsManager()->TriggerBackupIfNeeded( backupReporter ) )
+            SetStatusText( msg, 0 );
+    }
 
     UpdateTitle();
 
@@ -782,8 +785,11 @@ bool SCH_EDIT_FRAME::doAutoSave()
     {
         m_autoSaveState = false;
 
-        if( GetSettingsManager()->GetCommonSettings()->m_Backup.backup_on_autosave )
+        if( !Kiface().IsSingle() &&
+            GetSettingsManager()->GetCommonSettings()->m_Backup.backup_on_autosave )
+        {
             GetSettingsManager()->TriggerBackupIfNeeded( NULL_REPORTER::GetInstance() );
+        }
     }
 
     return autoSaveOk;
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 42bed56b9b..51f3ee4fe7 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -34,6 +34,7 @@
 #include <pgm_base.h>
 #include <msgpanel.h>
 #include <fp_lib_table.h>
+#include <kiface_i.h>
 #include <kiway.h>
 #include <kiway_player.h>
 #include <trace_helpers.h>
@@ -783,10 +784,13 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool addToHistory,
         return false;
     }
 
-    WX_STRING_REPORTER backupReporter( &upperTxt );
+    if( !Kiface().IsSingle() )
+    {
+        WX_STRING_REPORTER backupReporter( &upperTxt );
 
-    if( GetSettingsManager()->TriggerBackupIfNeeded( backupReporter ) )
-        upperTxt.clear();
+        if( GetSettingsManager()->TriggerBackupIfNeeded( backupReporter ) )
+            upperTxt.clear();
+    }
 
     GetBoard()->SetFileName( pcbFileName.GetFullPath() );
     UpdateTitle();
@@ -904,8 +908,11 @@ bool PCB_EDIT_FRAME::doAutoSave()
         UpdateTitle();
         m_autoSaveState = false;
 
-        if( GetSettingsManager()->GetCommonSettings()->m_Backup.backup_on_autosave )
+        if( !Kiface().IsSingle() &&
+            GetSettingsManager()->GetCommonSettings()->m_Backup.backup_on_autosave )
+        {
             GetSettingsManager()->TriggerBackupIfNeeded( NULL_REPORTER::GetInstance() );
+        }
 
         return true;
     }