--- node_expire.nodeapi	Fri May 29 09:57:50 2009
+++ node_expire.nodeapi	Fri May 29 09:57:21 2009
@@ -49,13 +49,12 @@
 
     case 'update':
     case 'insert':
-      $update = array();
-      if (isset($node->node_expire)) {
-        $update[] = 'nid';
+      db_query('DELETE FROM {node_expire} WHERE nid = %d', $node->nid);
+      if (!empty($node->expire)) {
+        $node->expire   = strtotime($node->expire);
+        $node->expired  = FALSE;
+        db_query('INSERT {node_expire} (nid, expire, expired) VALUES(%d, %d, %d)', $node->nid, $node->expire, $node->expired);
       }
-      $node->expire   = strtotime($node->expire);
-      $node->expired  = FALSE;
-      drupal_write_record('node_expire', $node, $update);
       break;
 
     case 'delete':