diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
index f69fea95..3816793a 100644
--- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
+++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
@@ -129,7 +129,14 @@ $(function() {
                     value.releaseNotes = undefined;
                 }
 
-                value.fullName = _.sprintf(gettext("%(displayName)s: %(displayVersion)s"), value);
+                var fullNameTemplate = gettext("%(name)s: %(version)s");
+                value.fullNameLocal = _.sprintf(fullNameTemplate, {name: value.displayName, version: value.displayVersion});
+
+                var fullNameRemoteVars = {name: value.displayName, version: gettext("unknown")};
+                if (value.hasOwnProperty("information") && value.information.hasOwnProperty("remote") && value.information.remote.hasOwnProperty("name")) {
+                    fullNameRemoteVars.version = value.information.remote.name;
+                }
+                value.fullNameRemote = _.sprintf(fullNameTemplate, fullNameRemoteVars);
 
                 versions.push(value);
             });
@@ -162,7 +169,7 @@ $(function() {
                     if (update_info.updateAvailable) {
                         text += "<li>"
                             + "<i class='icon-li " + (update_info.updatePossible ? "icon-ok" : "icon-remove")+ "'></i>"
-                            + "<span class='name' title='" + update_info.fullName + "'>" + update_info.fullName + "</span>"
+                            + "<span class='name' title='" + update_info.fullNameRemote + "'>" + update_info.fullNameRemote + "</span>"
                             + (update_info.releaseNotes ? "<a href=\"" +  update_info.releaseNotes + "\" target=\"_blank\">" + gettext("Release Notes") + "</a>" : "")
                             + "</li>";
                     }
diff --git a/src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2 b/src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2
index 2a3c92d3..2cdae112 100644
--- a/src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2
+++ b/src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2
@@ -10,7 +10,7 @@
         <ul>
             <!-- ko foreach: availableAndPossible -->
             <li>
-                <span class="name" data-bind="text: fullName, attr: {title: fullName}"></span>
+                <span class="name" data-bind="text: fullNameRemote, attr: {title: fullNameRemote}"></span>
                 <div class="releaseNotes" data-bind="visible: releaseNotes"><a data-bind="attr: {href: releaseNotes}">{{ _('Release Notes') }}</a></div>
             </li>
             <!-- /ko -->