diff --git a/CHANGELOG b/CHANGELOG
index f42523e..56b08ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ Revision history for Lutim
 	- Fix scroll-to-top when clicking on delete image
 	- Add CSP header
 	- Add X-Content-Type-Options, X-XSS-Protection, X-Frame-Options headers
+	- Remove @framasky as default tweet_card_via setting
 
 0.10.4 2018-05-07
 	- Fix bug in cache system that would allow someone to view an image with an incorrect decryption key
diff --git a/lib/Lutim.pm b/lib/Lutim.pm
index fdf356c..f552f72 100644
--- a/lib/Lutim.pm
+++ b/lib/Lutim.pm
@@ -32,7 +32,6 @@ sub startup {
             length                 => 8,
             always_encrypt         => 0,
             anti_flood_delay       => 5,
-            tweet_card_via         => '@framasky',
             max_file_size          => 10*1024*1024,
             https                  => 0,
             proposed_delays        => '0,1,7,30,365',
diff --git a/lib/Mounter.pm b/lib/Mounter.pm
index 4c08b29..3355446 100644
--- a/lib/Mounter.pm
+++ b/lib/Mounter.pm
@@ -27,7 +27,6 @@ sub startup {
                 length                 => 8,
                 always_encrypt         => 0,
                 anti_flood_delay       => 5,
-                tweet_card_via         => '@framasky',
                 max_file_size          => 10*1024*1024,
                 https                  => 0,
                 proposed_delays        => '0,1,7,30,365',
diff --git a/lutim.conf.template b/lutim.conf.template
index 9fe0188..ca78c30 100644
--- a/lutim.conf.template
+++ b/lutim.conf.template
@@ -51,8 +51,8 @@
 
     # twitter account which will appear on twitter cards
     # see https://dev.twitter.com/docs/cards/validation/validator to register your Lutim instance on twitter
-    # optional, default is @framasky
-    #tweet_card_via    => '@framasky',
+    # optional, no default
+    #tweet_card_via    => '@foo',
 
     # max image size, in octets
     # you can write it 10*1024*1024
diff --git a/themes/default/lib/Lutim/I18N/lutim.pot b/themes/default/lib/Lutim/I18N/lutim.pot
index 678b2af..809a452 100644
--- a/themes/default/lib/Lutim/I18N/lutim.pot
+++ b/themes/default/lib/Lutim/I18N/lutim.pot
@@ -32,11 +32,11 @@ msgstr ""
 msgid "-or-"
 msgstr ""
 
-#: lib/Lutim.pm:220 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:165 lib/Lutim/Command/cron/stats.pm:182 themes/default/templates/index.html.ep:5 themes/default/templates/partial/raw.js.ep:25 themes/default/templates/partial/raw.js.ep:8 themes/default/templates/raw.html.ep:10
+#: lib/Lutim.pm:219 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:165 lib/Lutim/Command/cron/stats.pm:182 themes/default/templates/index.html.ep:5 themes/default/templates/partial/raw.js.ep:25 themes/default/templates/partial/raw.js.ep:8 themes/default/templates/raw.html.ep:10
 msgid "1 year"
 msgstr ""
 
-#: lib/Lutim.pm:219 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/lutim.js.ep:149 themes/default/templates/partial/raw.js.ep:22 themes/default/templates/partial/raw.js.ep:5 themes/default/templates/raw.html.ep:7
+#: lib/Lutim.pm:218 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/lutim.js.ep:149 themes/default/templates/partial/raw.js.ep:22 themes/default/templates/partial/raw.js.ep:5 themes/default/templates/raw.html.ep:7
 msgid "24 hours"
 msgstr ""
 
@@ -503,7 +503,7 @@ msgstr ""
 msgid "core developer"
 msgstr ""
 
-#: lib/Lutim.pm:218 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:161 lib/Lutim/Command/cron/stats.pm:178 themes/default/templates/index.html.ep:3 themes/default/templates/partial/raw.js.ep:21 themes/default/templates/partial/raw.js.ep:4 themes/default/templates/raw.html.ep:6
+#: lib/Lutim.pm:217 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:161 lib/Lutim/Command/cron/stats.pm:178 themes/default/templates/index.html.ep:3 themes/default/templates/partial/raw.js.ep:21 themes/default/templates/partial/raw.js.ep:4 themes/default/templates/raw.html.ep:6
 msgid "no time limit"
 msgstr ""
 
diff --git a/themes/default/templates/twitter.html.ep b/themes/default/templates/twitter.html.ep
index be6a7c5..5ab8eb4 100644
--- a/themes/default/templates/twitter.html.ep
+++ b/themes/default/templates/twitter.html.ep
@@ -15,7 +15,9 @@
         <meta property="og:image" content="<%= $abs %>" />
         <meta property="og:image:url" content="<%= $abs %>" />
         <meta property="og:image:type" content="<%= $mimetype %>" />
+% if (config('tweet_card_via')) {
         <meta name="twitter:site" content="<%= config('tweet_card_via') %>">
+% }
         <meta name="twitter:image:src" content="<%= $abs %>">
 % if ($g) {
         <meta name="twitter:card" content="player">