diff --git a/mod/admin.php b/mod/admin.php
index ee95a180a..49596578b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -819,7 +819,6 @@ function admin_page_site_post(App $a) {
 	$nodeinfo		=	((x($_POST,'nodeinfo'))			? intval(trim($_POST['nodeinfo']))		: false);
 	$dfrn_only		=	((x($_POST,'dfrn_only'))		? True						: False);
 	$ostatus_disabled	=	!((x($_POST,'ostatus_disabled'))	? True  					: False);
-	$ostatus_poll_interval	=	((x($_POST,'ostatus_poll_interval'))	? intval(trim($_POST['ostatus_poll_interval']))	:  0);
 	$ostatus_full_threads	=	((x($_POST,'ostatus_full_threads'))	? True  					: False);
 	$diaspora_enabled	=	((x($_POST,'diaspora_enabled'))		? True   					: False);
 	$ssl_policy		=	((x($_POST,'ssl_policy'))		? intval($_POST['ssl_policy']) 			: 0);
@@ -967,7 +966,6 @@ function admin_page_site_post(App $a) {
 	set_config('system', 'curl_timeout', $timeout);
 	set_config('system', 'dfrn_only', $dfrn_only);
 	set_config('system', 'ostatus_disabled', $ostatus_disabled);
-	set_config('system', 'ostatus_poll_interval', $ostatus_poll_interval);
 	set_config('system', 'ostatus_full_threads', $ostatus_full_threads);
 	set_config('system', 'diaspora_enabled', $diaspora_enabled);
 
@@ -1194,7 +1192,6 @@ function admin_page_site(App $a) {
 		'$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
 		'$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
 		'$ostatus_disabled' 	=> array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
-		'$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices),
 		'$ostatus_full_threads'	=> array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), get_config('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
 		'$ostatus_not_able'	=> t("OStatus support can only be enabled if threading is enabled."),
 		'$diaspora_able'	=> $diaspora_able,
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 6a3c3fbcd..04af33430 100644
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -85,7 +85,6 @@
 
 	{{if $thread_allow.2}}
 		{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-		{{include file="field_select.tpl" field=$ostatus_poll_interval}}
 		{{include file="field_checkbox.tpl" field=$ostatus_full_threads}}
 	{{else}}
 		<div class='field checkbox' id='div_id_{{$ostatus_disabled.0}}'>
diff --git a/view/theme/frost-mobile/templates/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl
index fb3694f59..95d13c019 100644
--- a/view/theme/frost-mobile/templates/admin_site.tpl
+++ b/view/theme/frost-mobile/templates/admin_site.tpl
@@ -40,7 +40,6 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$no_community_page}}
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
 	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}
diff --git a/view/theme/frost/templates/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl
index ab0b6af73..cc301a2dc 100644
--- a/view/theme/frost/templates/admin_site.tpl
+++ b/view/theme/frost/templates/admin_site.tpl
@@ -40,7 +40,6 @@
 	{{include file="field_checkbox.tpl" field=$force_publish}}
 	{{include file="field_checkbox.tpl" field=$no_community_page}}
 	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
 	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}