diff --git a/resources/migrations/20180130164001-issues-archived.down.sql b/resources/migrations/20180130164001-issues-archived.down.sql
new file mode 100644
index 0000000..55543e1
--- /dev/null
+++ b/resources/migrations/20180130164001-issues-archived.down.sql
@@ -0,0 +1 @@
+DROP TABLE issues_archived;
diff --git a/resources/migrations/20180130164001-issues-archived.up.sql b/resources/migrations/20180130164001-issues-archived.up.sql
new file mode 100644
index 0000000..aec9957
--- /dev/null
+++ b/resources/migrations/20180130164001-issues-archived.up.sql
@@ -0,0 +1,2 @@
+CREATE TABLE issues_archived
+AS SELECT * FROM issues where false;
diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 6f7d0a9..27c0edd 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -1,3 +1,4 @@
+
 -- Users ---------------------------------------------------------------------------
 
 -- :name create-user! :<! :1
@@ -127,6 +128,16 @@ INSERT INTO issues (repo_id, issue_id, issue_number, title)
 
 -- :name remove-issue! :<! :1
 -- :doc removes issue
+WITH deleted AS (
+  SELECT * FROM issues
+  WHERE repo_id = :repo_id 
+  AND issue_id = :issue_id
+  AND value_usd = 0.0
+),
+archived AS (
+  INSERT INTO issues_archived
+  SELECT * FROM deleted
+)
 DELETE FROM issues
   WHERE repo_id = :repo_id 
   AND issue_id = :issue_id