diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4c8df3f86d7..40150d71c8d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-02  Marcin Kościelnicki  <koriakin@0x04.net>
+
+	* tracepoint.c (cmd_qtstart): Only set ipa_tdesc_idx if agent
+	is actually loaded.
+
 2016-02-25  Marcin Kościelnicki  <koriakin@0x04.net>
 
 	* linux-s390-low.c (s390_num_regs_3264): Define on 31-bit too.
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index dbd0b46dce9..383fb71398c 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -3214,10 +3214,13 @@ cmd_qtstart (char *packet)
 
   *packet = '\0';
 
-  /* Tell IPA about the correct tdesc.  */
-  if (write_inferior_integer (ipa_sym_addrs.addr_ipa_tdesc_idx,
-			      target_get_ipa_tdesc_idx ()))
-    error ("Error setting ipa_tdesc_idx variable in lib");
+  if (agent_loaded_p ())
+    {
+      /* Tell IPA about the correct tdesc.  */
+      if (write_inferior_integer (ipa_sym_addrs.addr_ipa_tdesc_idx,
+				  target_get_ipa_tdesc_idx ()))
+        error ("Error setting ipa_tdesc_idx variable in lib");
+    }
 
   /* Start out empty.  */
   if (agent_loaded_p ())