diff --git a/CHANGELOG.md b/CHANGELOG.md
index 638cc641..ef39efd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - **Removes the need to pick a user-data-storage service upfront.** You can now use the app immediately without having to sign in first.
 - Fixes authentication issue with RemoteStorage
+- Sets https://ipfs.io as the default IPFS gateway.
 
 
 ## 3.2.0
diff --git a/src/Applications/UI/Sources/Form.elm b/src/Applications/UI/Sources/Form.elm
index ae4c53c0..6fb44433 100644
--- a/src/Applications/UI/Sources/Form.elm
+++ b/src/Applications/UI/Sources/Form.elm
@@ -5,7 +5,7 @@ import Common exposing (boolFromString, boolToString)
 import Conditional exposing (..)
 import Dict.Ext as Dict
 import Html exposing (Html, text)
-import Html.Attributes exposing (for, name, placeholder, required, selected, type_, value)
+import Html.Attributes as A exposing (for, name, placeholder, required, selected, type_, value)
 import Html.Events exposing (onInput, onSubmit)
 import List.Extra as List
 import Material.Icons.Round as Icons
@@ -474,9 +474,23 @@ note service =
 
         Ipfs ->
             howNote
-                [ inline [ "font-semibold" ] [ text "Diffuse will try to use the default local gateway" ]
+                [ inline
+                    [ "font-semibold" ]
+                    [ text "Diffuse will use the ipfs.io gateway by default" ]
                 , text "."
                 , lineBreak
+                , inline
+                    []
+                    [ text "There are also "
+                    , Html.a
+                        [ A.href "https://ipfs.github.io/public-gateway-checker/"
+                        , A.class "underline"
+                        , A.target "_blank"
+                        ]
+                        [ text "other public gateways" ]
+                    , text " you can choose from."
+                    ]
+                , lineBreak
                 , text "If you would like to use another gateway, please provide it below."
                 ]
 
diff --git a/src/Library/Sources/Services/Ipfs.elm b/src/Library/Sources/Services/Ipfs.elm
index fc68d6f0..af17a864 100644
--- a/src/Library/Sources/Services/Ipfs.elm
+++ b/src/Library/Sources/Services/Ipfs.elm
@@ -38,7 +38,7 @@ defaults =
 
 
 defaultGateway =
-    "http://127.0.0.1:8080"
+    "https://ipfs.io"
 
 
 {-| The list of properties we need from the user.