diff --git a/src/core/bittorrent/torrenthandle.cpp b/src/core/bittorrent/torrenthandle.cpp
index f2ef6a45d..651859aeb 100644
--- a/src/core/bittorrent/torrenthandle.cpp
+++ b/src/core/bittorrent/torrenthandle.cpp
@@ -206,7 +206,8 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
     if (!data.resumed) {
         if (hasMetadata()) {
             setFirstLastPiecePriority(data.sequential);
-            appendExtensionsToIncompleteFiles();
+            if (m_session->isAppendExtensionEnabled())
+                appendExtensionsToIncompleteFiles();
         }
     }
 }
@@ -1550,7 +1551,8 @@ void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p
     Q_UNUSED(p);
     qDebug("Metadata received for torrent %s.", qPrintable(name()));
     updateStatus();
-    appendExtensionsToIncompleteFiles();
+    if (m_session->isAppendExtensionEnabled())
+        appendExtensionsToIncompleteFiles();
     m_session->handleTorrentMetadataReceived(this);
 
     if (isPaused()) {