diff --git a/gobject/gobject.c b/gobject/gobject.c
index d843d57b9..96a9d4f31 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1238,6 +1238,9 @@ g_object_notify_by_pspec (GObject    *object,
   g_return_if_fail (G_IS_OBJECT (object));
   g_return_if_fail (G_IS_PARAM_SPEC (pspec));
 
+  if (g_atomic_int_get (&object->ref_count) == 0)
+    return;
+
   g_object_ref (object);
   g_object_notify_by_spec_internal (object, pspec);
   g_object_unref (object);
diff --git a/gobject/tests/properties.c b/gobject/tests/properties.c
index 27c2a2258..7140f906c 100644
--- a/gobject/tests/properties.c
+++ b/gobject/tests/properties.c
@@ -67,6 +67,13 @@ test_object_finalize (GObject *gobject)
 {
   g_free (((TestObject *) gobject)->baz);
 
+  /* When the ref_count of an object is zero it is still
+   * possible to notify the property, but it should do
+   * nothing and silenty quit (bug #705570)
+   */
+  g_object_notify (gobject, "foo");
+  g_object_notify_by_pspec (gobject, properties[PROP_BAR]);
+
   G_OBJECT_CLASS (test_object_parent_class)->finalize (gobject);
 }