diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index fe8f2b82a8..e6ff7691c6 100644
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -1419,7 +1419,8 @@ proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e
     ProtoTreeModel *model;
 
     model = proto_tree_model_new(protocol_tree, prefs.display_hidden_proto_items);
-    proto_tree_model_force_resolv(PROTO_TREE_MODEL(model), resolv);
+    if (resolv)
+        proto_tree_model_force_resolv(PROTO_TREE_MODEL(model), resolv);
     gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(model));
 
     gtk_tree_model_foreach(GTK_TREE_MODEL(model), expand_finfos, GTK_TREE_VIEW(tree_view));
@@ -1430,13 +1431,7 @@ proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e
 void
 proto_tree_draw(proto_tree *protocol_tree, GtkWidget *tree_view)
 {
-    ProtoTreeModel *model;
-
-    model = proto_tree_model_new(protocol_tree, prefs.display_hidden_proto_items);
-    gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(model));
-
-    gtk_tree_model_foreach(GTK_TREE_MODEL(model), expand_finfos, GTK_TREE_VIEW(tree_view));
-    g_object_unref(G_OBJECT(model));
+    proto_tree_draw_resolve(protocol_tree, tree_view, NULL);
 }
 
 void