diff --git a/app/helpers/o_embed_helper.rb b/app/helpers/o_embed_helper.rb
index 3170fbe25..f30f36bfe 100644
--- a/app/helpers/o_embed_helper.rb
+++ b/app/helpers/o_embed_helper.rb
@@ -20,7 +20,7 @@ module OEmbedHelper
     else
     end
 
-    return html.gsub('http', 'https').html_safe
+    return html.gsub('http://', 'https://').html_safe
   end
 
   def link_to_oembed_image(cache, prefix = 'thumbnail_')
diff --git a/spec/helpers/o_embed_helper_spec.rb b/spec/helpers/o_embed_helper_spec.rb
index c7333dd19..36bf4ded9 100644
--- a/spec/helpers/o_embed_helper_spec.rb
+++ b/spec/helpers/o_embed_helper_spec.rb
@@ -109,7 +109,7 @@ describe OEmbedHelper do
         real_data = data['oembed_data']
         cache =  OEmbedCache.new(:url => data['link_url'])
         cache.data = real_data
-        formatted = o_embed_html(cache).gsub('https', 'http')
+        formatted = o_embed_html(cache).gsub('https://', 'http://')
         case type
           when 'photo'
             formatted.should =~ /#{data['oembed_data']['url']}/