Index: embed/ephy-history.c
===================================================================
--- embed/ephy-history.c	(revision 7233)
+++ embed/ephy-history.c	(working copy)
@@ -133,11 +133,6 @@ ephy_history_set_enabled (EphyHistory *h
 	history->priv->enabled = enabled;
 
 	ephy_node_db_set_immutable (history->priv->db, !enabled);
-
-	if (enabled == FALSE)
-	{
-		ephy_history_clear (history);
-	}
 }
 
 static void
@@ -169,7 +164,7 @@ ephy_history_get_property (GObject *obje
 		case PROP_ENABLED:
 			g_value_set_boolean (value, history->priv->enabled);
 			break;
-		}
+	}
 }
 
 static void
@@ -288,7 +283,7 @@ ephy_history_save (EphyHistory *eb)
 	int ret;
 
 	/* only save if there are changes */
-	if (eb->priv->dirty == FALSE)
+	if (eb->priv->dirty == FALSE && eb->priv->enabled)
 	{
 		return;
 	}
