diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 6c819eef..5ba7d116 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -24,9 +24,7 @@ public interface Signal extends DBusInterface {
 
     void setContactName(String number, String name);
 
-    void blockContact(String number);
-
-    void unblockContact(String number);
+    void setContactBlocked(String number, boolean blocked);
 
     List<byte[]> getGroupIds();
 
diff --git a/src/main/java/org/asamk/signal/commands/BlockContactCommand.java b/src/main/java/org/asamk/signal/commands/BlockContactCommand.java
index 92de4750..7cbc9e8f 100644
--- a/src/main/java/org/asamk/signal/commands/BlockContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockContactCommand.java
@@ -22,7 +22,7 @@ public class BlockContactCommand implements LocalCommand {
 
         String number = ns.getString("number");
 
-        m.blockContact(number);
+        m.setContactBlocked(number, true);
 
         return 0;
     }
diff --git a/src/main/java/org/asamk/signal/commands/UnblockContactCommand.java b/src/main/java/org/asamk/signal/commands/UnblockContactCommand.java
index af44e638..1abb9508 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockContactCommand.java
@@ -22,7 +22,7 @@ public class UnblockContactCommand implements LocalCommand {
 
         String number = ns.getString("number");
 
-        m.unblockContact(number);
+        m.setContactBlocked(number, false);
 
         return 0;
     }
diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 757b5ecf..b5d63215 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -687,31 +687,16 @@ public class Manager implements Signal {
     }
 
     @Override
-    public void blockContact(String number) {
+    public void setContactBlocked(String number, boolean blocked) {
         ContactInfo contact = account.getContactStore().getContact(number);
         if (contact == null) {
             contact = new ContactInfo();
             contact.number = number;
-            System.err.println("Adding and blocking contact " + number);
+            System.err.println("Adding and " + (blocked ? "blocking" : "unblocking") + " contact " + number);
         } else {
-            System.err.println("Blocking contact " + number);
+            System.err.println((blocked ? "Blocking" : "Unblocking") + " contact " + number);
         }
-        contact.blocked = true;
-        account.getContactStore().updateContact(contact);
-        account.save();
-    }
-
-    @Override
-    public void unblockContact(String number) {
-        ContactInfo contact = account.getContactStore().getContact(number);
-        if (contact == null) {
-            contact = new ContactInfo();
-            contact.number = number;
-            System.err.println("Adding and unblocking contact " + number);
-        } else {
-            System.err.println("Unblocking contact " + number);
-        }
-        contact.blocked = false;
+        contact.blocked = blocked;
         account.getContactStore().updateContact(contact);
         account.save();
     }