diff --git a/WordPress/Classes/Models/Blog.h b/WordPress/Classes/Models/Blog.h
index 78c35062476c..075e13a70bc6 100644
--- a/WordPress/Classes/Models/Blog.h
+++ b/WordPress/Classes/Models/Blog.h
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class UserSuggestion;
 @class SiteSuggestion;
 @class PageTemplateCategory;
+@class JetpackFeaturesRemovalCoordinator;
 
 extern NSString * const BlogEntityName;
 extern NSString * const PostFormatStandard;
diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m
index d6f885f4d70c..17e55c17486b 100644
--- a/WordPress/Classes/Models/Blog.m
+++ b/WordPress/Classes/Models/Blog.m
@@ -691,7 +691,8 @@ - (BOOL)supportsPluginManagement
 - (BOOL)supportsStories
 {
     BOOL hasRequiredJetpack = [self hasRequiredJetpackVersion:@"9.1"];
-    return hasRequiredJetpack || self.isHostedAtWPcom;
+    // Stories are disabled in iPad until this Kanvas issue is solved: https://github.com/tumblr/kanvas-ios/issues/104
+    return (hasRequiredJetpack || self.isHostedAtWPcom) && ![UIDevice isPad] && ![JetpackFeaturesRemovalCoordinator shouldRemoveJetpackFeatures];
 }
 
 - (BOOL)supportsContactInfo
diff --git a/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift b/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift
index 5d6efbbafa33..a2ebc2545405 100644
--- a/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift	
+++ b/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+FAB.swift	
@@ -28,7 +28,7 @@ extension MySiteViewController {
 
         var actions: [ActionSheetItem] = []
 
-        if shouldShowNewStory {
+        if blog?.supports(.stories) ?? false {
             actions.append(StoryAction(handler: newStory, source: source))
         }
 
@@ -38,8 +38,4 @@ extension MySiteViewController {
         let coordinator = CreateButtonCoordinator(self, actions: actions, source: source, blog: blog)
         return coordinator
     }
-
-    private var shouldShowNewStory: Bool {
-        return (blog?.supports(.stories) ?? false) && !UIDevice.isPad()
-    }
 }