diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index 58a552d9ae0..361b678f1c4 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -563,7 +563,7 @@ public List<Map<String, Object>> getJobListforNotebook(boolean needsReload,
 
       // set notebook Name
       String notebookName = note.getName();
-      if (notebookName != null) {
+      if (notebookName != null && !notebookName.equals("")) {
         info.put("notebookName", note.getName());
       } else {
         info.put("notebookName", "Note " + note.id());
@@ -593,9 +593,9 @@ public List<Map<String, Object>> getJobListforNotebook(boolean needsReload,
 
         // is update notebook for last server update time.
         if (lastRunningUnixTime > lastUpdateServerUnixTime) {
-          paragraphsInfo.add(paragraphItem);
           isUpdateNotebook = true;
         }
+        paragraphsInfo.add(paragraphItem);
       }
 
       // set interpreter bind type