diff --git a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
index 2d8e5805a..a78f498b1 100644
--- a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
@@ -97,9 +97,11 @@ THE SOFTWARE.
                         <tr ng-repeat="wrapper in historyEntryWrappers">
                             <td class="username">{{wrapper.entry.username}}</td>
                             <td class="start">{{wrapper.entry.startDate | date:'short'}}</td>
-                            <td ng-show="wrapper.entry.endDate && !wrapper.entry.active" class="duration">{{'manage.edit.connection.history.formattedDuration' | translate:"{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"}}</td>
-                            <td ng-show="!wrapper.entry.endDate && !wrapper.entry.active" class="duration">{{'manage.edit.connection.history.unknownEnd' | translate}}</td>
-                            <td ng-show="wrapper.entry.active" class="duration">{{'manage.edit.connection.history.activeNow' | translate}}</td>
+                            <td class="duration">
+                                <span ng-show="wrapper.duration">{{'manage.edit.connection.history.formattedDuration' | translate:"{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"}}</span>
+                                <span ng-show="wrapper.entry.active">{{'manage.edit.connection.history.activeNow' | translate}}</span>
+                                <span ng-show="!wrapper.entry.active &amp;&amp; !wrapper.duration">{{'manage.edit.connection.history.unknownEnd' | translate}}</span>
+                            </td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js b/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
index f40f40a42..6d12c57bf 100644
--- a/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
+++ b/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
@@ -103,8 +103,8 @@ angular.module('manage').factory('HistoryEntryWrapper', [function defineHistoryE
          */
         this.duration = null;
 
-        // Set the duration if the necessary information is present
-        if (historyEntry.endDate && historyEntry.startDate)
+        // Set the duration if the necessary information is present and the entry is not still active
+        if (historyEntry.endDate && historyEntry.startDate && !historyEntry.active)
             this.duration = formatMilliseconds(historyEntry.endDate - historyEntry.startDate);
 
     };