diff --git a/data/textsecure-cli@.service b/data/textsecure-cli@.service
index 002d347b..3e39571e 100644
--- a/data/textsecure-cli@.service
+++ b/data/textsecure-cli@.service
@@ -7,6 +7,7 @@ After=network.target
 
 [Service]
 Type=dbus
+Environment=TEXTSECURE_CLI_OPTS="-Xms2m"
 ExecStart=%dir%/bin/textsecure-cli -u %I --config /var/lib/textsecure-cli daemon --system
 User=textsecure-cli
 BusName=org.asamk.TextSecure
diff --git a/data/textsecure.service b/data/textsecure.service
index b40debcb..8b302d84 100644
--- a/data/textsecure.service
+++ b/data/textsecure.service
@@ -3,6 +3,7 @@ Description=Send secure messages to TextSecure/Signal clients
 
 [Service]
 Type=dbus
+Environment=TEXTSECURE_CLI_OPTS="-Xms2m"
 ExecStart=%dir%/bin/textsecure-cli -u %number% --config /var/lib/textsecure-cli daemon --system
 User=textsecure-cli
 BusName=org.asamk.TextSecure