diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7c044b960..ec491c55ef 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-25  Yao Qi  <yao@codesourcery.com>
+
+	* remote.c (remote_traceframe_info): Return early if
+	traceframe is not selected.
+
 2013-10-25  Yao Qi  <yao@codesourcery.com>
 
 	* tracepoint.c (traceframe_fun): Remove.
diff --git a/gdb/remote.c b/gdb/remote.c
index 7d8a4deb77..7bd9b2a3b4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11157,6 +11157,11 @@ remote_traceframe_info (void)
 {
   char *text;
 
+  /* If current traceframe is not selected, don't bother the remote
+     stub.  */
+  if (get_traceframe_number () < 0)
+    return NULL;
+
   text = target_read_stralloc (&current_target,
 			       TARGET_OBJECT_TRACEFRAME_INFO, NULL);
   if (text != NULL)