diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index e70d24d20b8..5bde425c4ea 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -714,7 +714,8 @@ M.form_filemanager.init = function(Y, options) {
             if (filenode) {
                 // File has a license already, use it.
                 selectedlicense = filenode.license;
-            } else if (this.filepicker_options.rememberuserlicensepref) {
+            } else if (this.filepicker_options.rememberuserlicensepref && this.get_preference('recentlicense')) {
+                // When 'Remember user licence preference' is enabled use the last license selected by the user, if any.
                 selectedlicense = this.get_preference('recentlicense');
             }
             var licenses = this.filepicker_options.licenses;
diff --git a/repository/filepicker.js b/repository/filepicker.js
index 2a41fac49ef..5c5f0fa2fb4 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -1784,7 +1784,8 @@ M.core_filepicker.init = function(Y, options) {
             if (filenode) {
                 // File has a license already, use it.
                 selectedlicense = filenode.license;
-            } else if (this.options.rememberuserlicensepref) {
+            } else if (this.options.rememberuserlicensepref && this.get_preference('recentlicense')) {
+                // When 'Remember user licence preference' is enabled use the last license selected by the user, if any.
                 selectedlicense = this.get_preference('recentlicense');
             }
             var licenses = this.options.licenses;