diff --git a/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java b/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
index b86d880..f25f872 100644
--- a/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java
@@ -31,6 +31,7 @@ public class TopicsPanel extends Composite {
 	public static final String loading = GWT.getModuleBaseURL() + "../images/topics-loader.gif";
 	public static final String DISPLAY_NAME =  "Top Topics";
 	public static final int THRESHOLD_SHOW_HASHTAGS = 10; // show the first X ones
+	private static final String NO_TOP_TOPICS_MESSAGE = "No Topics Available";
 
 	private Image loadingImage;
 
@@ -55,7 +56,7 @@ public class TopicsPanel extends Composite {
 				}
 				else {
 					int counter = 0;
-					if (hashtags != null) {
+					if (hashtags != null && !hashtags.isEmpty()) {
 						for (String hashtag : hashtags) {
 							counter ++;
 							HTML toAdd = new HTML(hashtag);
@@ -65,30 +66,35 @@ public class TopicsPanel extends Composite {
 							if(counter > THRESHOLD_SHOW_HASHTAGS) // 11, 12...
 								toAdd.setVisible(false);
 						}
-					}		
 
-					// add a show all button if needed
-					if(counter > THRESHOLD_SHOW_HASHTAGS){
+						// add a show all button if needed
+						if(counter > THRESHOLD_SHOW_HASHTAGS){
 
-						final Button showAllHashtags = new Button("Show All");
-						
-						showAllHashtags.addClickHandler(new ClickHandler() {
+							final Button showAllHashtags = new Button("Show All");
 
-							@Override
-							public void onClick(ClickEvent event) {
+							showAllHashtags.addClickHandler(new ClickHandler() {
 
-								int numberChildren = mainPanel.getWidgetCount();
-								for (int i = THRESHOLD_SHOW_HASHTAGS; i < numberChildren; i++) { 
+								@Override
+								public void onClick(ClickEvent event) {
 
-									mainPanel.getWidget(i).setVisible(true);
+									int numberChildren = mainPanel.getWidgetCount();
+									for (int i = THRESHOLD_SHOW_HASHTAGS; i < numberChildren; i++) { 
 
+										mainPanel.getWidget(i).setVisible(true);
+
+									}
+
+									// hide the button
+									showAllHashtags.setVisible(false);
 								}
+							});
+							mainPanel.add(showAllHashtags);
+						}
+
+					}else{
+
+						mainPanel.add(new HTML(NO_TOP_TOPICS_MESSAGE));
 
-								// hide the button
-								showAllHashtags.setVisible(false);
-							}
-						});
-						mainPanel.add(showAllHashtags);
 					}
 				}
 			}